mergetool: Don't error out in the merge case where the local file is deleted
authorTheodore Ts'o <tytso@mit.edu>
Tue, 27 Mar 2007 22:00:03 +0000 (18:00 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 29 Mar 2007 16:22:48 +0000 (12:22 -0400)
commitce5b6d7...2bf4fdc72697ef85b3589983f52d7007
treedfd384f...023e1b29335a8f3600ea545cdeefc2d8copy hash to clipboard (tree)
parent20fa04e...6bad985d74bd2c0180701f1c69272801copy hash to clipboard (diff)
git-mergetool.sh