mergetool: Provide an empty file when needed
authorDavid Aguilar <davvid@gmail.com>
Fri, 20 Jan 2012 07:47:35 +0000 (23:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Jan 2012 19:50:22 +0000 (11:50 -0800)
commitec245ba...4944473ba6657a826643ef90ed02b51d
treea2efa5a...e53ebc42761cad8a8b58a513083f36e6copy hash to clipboard (tree)
parent5fbdb9c...e8cc7226d9a9e7de5ad09ac5f0a0b906copy hash to clipboard (diff)
git-mergetool.sh
t/t7610-mergetool.sh