| commit | ec245ba04944473ba6657a826643ef90ed02b51d | |
| author | David Aguilar <davvid@gmail.com> | |
| Fri, 20 Jan 2012 07:47:35 +0000 (19 23:47 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 23 Jan 2012 19:50:22 +0000 (23 11:50 -0800) | ||
| tree | a2efa5abe53ebc42761cad8a8b58a513083f36e6 | treesnapshot (tar.gz zip) |
| parent | 5fbdb9c2e8cc7226d9a9e7de5ad09ac5f0a0b906 | commitdiff |
mergetool: Provide an empty file when needed
Some merge tools cannot cope when $LOCAL, $BASE, or $REMOTE are missing.
$BASE can be missing when two branches independently add the same
filename.
Provide an empty file to make these tools happy.
When a delete/modify conflict occurs, $LOCAL and $REMOTE can also be
missing. We have special case code to handle such case so this change
may not affect that codepath, but try to be consistent and create an
empty file for them anyway.
Reported-by: Jason Wenger <jcwenger@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Some merge tools cannot cope when $LOCAL, $BASE, or $REMOTE are missing.
$BASE can be missing when two branches independently add the same
filename.
Provide an empty file to make these tools happy.
When a delete/modify conflict occurs, $LOCAL and $REMOTE can also be
missing. We have special case code to handle such case so this change
may not affect that codepath, but try to be consistent and create an
empty file for them anyway.
Reported-by: Jason Wenger <jcwenger@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-mergetool.sh | diffblobblamehistory | |
| t/t7610-mergetool.sh | diffblobblamehistory |