On Fri, Jan 20, 2012 at 01:53, David Aguilar <davvid@xxxxxxxxx> wrote: > On Thu, Jan 19, 2012 at 11:47 PM, David Aguilar <davvid@xxxxxxxxx> wrote: >> Some merge tools cannot cope when $LOCAL, $BASE, or $REMOTE >> are missing. $BASE can be missing when two branches >> independently add the same filename. $LOCAL and $REMOTE >> can be missing when a delete/modify conflict occurs. >> >> Provide an empty file to make these tools happy. This is cleaner, yes -- but is this extra processing on $LOCAL and $REMOTE necessary? Git mergetool doesn't actually call an external mergetool during del/mod conflicts -- instead it goes into an alternate processing and prompts the user interactively whether to take the deleted or modified file. Can these changes be reached? (command line option I'm not aware of?) --jcw -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html