Well, you can use bzr's implementation of patience diff with git via the
GIT_EXTERNAL_DIFF environment variable, and newer versions of git have
their own implementation of patience diff that you can use with git diff
--patience, but these are for the git diff command only, not merging. To
get git to merge using patience diff you would need to write a custom
merge driver, which could use either bzr's or git's implementation of
patience diff and do the merge, or you'd need to patch git to add
something like a git merge --patience option.
I tested with bzr and it handles this particular use case cleanly. It
must use patience diff by default when merging. I might switch to bzr.
On Mon, Apr 26, 2010 at 06:12:35PM +0100, chombee wrote:
> 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 mailing list