summaryrefslogtreecommitdiff
path: root/vcs-svn
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2012-01-19 23:47:35 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-23 11:50:22 -0800
commitec245ba04944473ba6657a826643ef90ed02b51d (patch)
treea2efa5abe53ebc42761cad8a8b58a513083f36e6 /vcs-svn
parentMerge branch 'jm/mergetool-pathspec' (diff)
downloadtgif-ec245ba04944473ba6657a826643ef90ed02b51d.tar.xz
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>
Diffstat (limited to 'vcs-svn')
0 files changed, 0 insertions, 0 deletions