From: chombee <chombee@lavabit.com>
Date: Mon, 26 Apr 2010 18:09:23 GMT
Subject: Git merge using patience diff?
Message-ID: <20100426180923.GC18122@debxo>

Hey,

Is it possible to get git to use patience diff when merging?

My version of git is 1.5.*, from before git diff had the --patience
option. I got git diff to use bzr's implementation of patience diff via
GIT_EXTERNAL_DIFF. But when merging git still seems to use its normal
diff. Will I need to write my own merge driver that uses patience diff?

Thanks