projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 20fa04e) | patch
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)
commitce5b6d752bf4fdc72697ef85b3589983f52d7007
treedfd384f1023e1b29335a8f3600ea545cdeefc2d8tree | snapshot
parent20fa04ea6bad985d74bd2c0180701f1c69272801commit | diff
mergetool: Don't error out in the merge case where the local file is deleted

If the file we are trying to merge resolve is in git-ls-files -u, then
skip the file existence test.  If the file isn't reported in
git-ls-files, then check to see if the file exists or not to give an
appropriate error message.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
git-mergetool.sh diff | blob | history
Git—the stupid content tracker