Junio C Hamano 561b0fbb4a Fix merge-one-file for our-side-added/our-side-removed cases ...

When commit ed93b449 changed the script so that it does not
touch untracked working tree file, we forgot that we still
needed to resolve the index entry (otherwise they are left
unmerged).

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

2007-07-08 18:24:19 -07:00

3.3 KiB

Executable File

Raw Blame History

View Raw