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.

_______________________________________________
vcs-home mailing list
vcs-home@lists.madduck.net
http://lists.madduck.net/listinfo/vcs-home

Reply via email to