{"thread":{"id":"23610","subject":"Git merge using patience diff?","startedAt":"2010-04-26T18:09:23Z","lastAt":"2010-04-26T18:59:34Z","messageCount":2,"participants":["chombee","Jonathan Nieder"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"140438","messageId":"20100426180923.GC18122@debxo","threadId":"23610","inReplyTo":null,"subject":"Git merge using patience diff?","fromName":"chombee","fromEmail":"chombee@lavabit.com","sentAt":"2010-04-26T18:09:23Z","receivedAt":"2010-04-26T18:09:23Z","isPatch":false,"sender":{"key":"chombee@lavabit.com","avatar":null},"body":"Hey,\n\nIs it possible to get git to use patience diff when merging?\n\nMy version of git is 1.5.*, from before git diff had the --patience\noption. I got git diff to use bzr's implementation of patience diff via\nGIT_EXTERNAL_DIFF. But when merging git still seems to use its normal\ndiff. Will I need to write my own merge driver that uses patience diff?\n\nThanks\n"},{"id":"140444","messageId":"20100426185933.GA11518@progeny.tock","threadId":"23610","inReplyTo":"20100426180923.GC18122@debxo","subject":"Re: Git merge using patience diff?","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-04-26T18:59:34Z","receivedAt":"2010-04-26T18:59:34Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi,\n\nchombee wrote:\n\n> My version of git is 1.5.*, from before git diff had the --patience\n> option. I got git diff to use bzr's implementation of patience diff via\n> GIT_EXTERNAL_DIFF. But when merging git still seems to use its normal\n> diff. Will I need to write my own merge driver that uses patience diff?\n\nYou will need to if you want that functionality.  By the way, if you\nwrite a clean patch that adds a git-merge-patience program to git.git\nso one can use ‘git merge -s patience’ out of the box, I imagine you\nwould find some appreciative users.\n\nYou could even piggy-back on merge-recursive to do most of the work\n(and share a main() function and so on), like merge-subtree did: see\ncommit 68faf689 (A new merge strategy 'subtree', 2007-02-15) in\ngit.git.\n\nYou might also be interested in the patches at\n<http://bugs.debian.org/522361>, which add patience diff support to\ngit add --patch and friends (and are sitting in limbo until I find\na chance to write some tests for them).\n\nHope that helps,\nJonathan\n"}]}