diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-25 10:08:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-25 17:10:10 -0800 |
| commit | 9d9a2f4aba3650093bad952cd89e276cde4ed074 (patch) | |
| tree | f8485ca544f24ee89f92c578cfea50f3a164246d /git.c | |
| parent | cfc5789ada444423232fa1533f401b5972eb3f6c (diff) | |
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>
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions