| commit | 9d9a2f4aba3650093bad952cd89e276cde4ed074 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 25 Dec 2009 18:08:04 +0000 (25 10:08 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 26 Dec 2009 01:10:10 +0000 (25 17:10 -0800) | ||
| tree | f8485ca544f24ee89f92c578cfea50f3a164246d | treesnapshot (tar.gz zip) |
| parent | cfc5789ada444423232fa1533f401b5972eb3f6c | commitdiff |
resolve-undo: basic tests
Make sure that resolving a failed merge with git add records
the conflicted state, committing the result keeps that state,
and checking out another commit clears the state.
"git ls-files" learns a new option --resolve-undo to show the
recorded information.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Make sure that resolving a failed merge with git add records
the conflicted state, committing the result keeps that state,
and checking out another commit clears the state.
"git ls-files" learns a new option --resolve-undo to show the
recorded information.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-ls-files.c | diffblobblamehistory | |
| t/t2030-unresolve-info.sh | [new file with mode: 0755] | blob |