diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-24 03:51:22 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-24 03:58:13 +0300 |
| commit | d7ebd53d371153f7a61c0fe9f384c9662b751bf6 (patch) | |
| tree | 08cd9a0e082f05c59109c3cbf029bd94488a1c2d /t/t1300-repo-config.sh | |
| parent | c9a899256920b3266bb29f9d22bf6b9ab1b5a377 (diff) | |
git-checkout -m: fix merge case
Commit c1a4278e switched the "merging checkout" implementation
from 3-way read-tree to merge-recursive, but forgot that
merge-recursive will signal an unmerged state with its own exit
status code. This prevented the clean-up phase (paths cleanly
merged should not be updated in the index) from running.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t1300-repo-config.sh')
0 files changed, 0 insertions, 0 deletions