Junio C Hamano 29dc133198 git-merge-one-file: fix longstanding stupid thinko ...

When a merge result creates a new file, and when our side already has a
file in the path, taking the merge result may clobber the untracked file.
However, the logic to detect this situation was totally the wrong way.  We
should complain when the file exists, not when the file does not exist.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

2008-03-18 22:17:17 -07:00

3.4 KiB

Executable File

Raw Blame History

View Raw