Git merge disappointment

chombee chombee at
Mon Apr 26 19:12:35 CEST 2010

Thanks all. Patience diff may be what I was looking for. I don't want to
patch git, but perhaps I can implement patience-diff in my merge driver.
I haven't tested but apparently bzr uses patience diff, it may be that
if I put my notes file in bzr it will just work.

More information about the vcs-home mailing list