diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-31 15:44:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-31 16:13:49 -0700 |
| commit | ed3789f2f0ab8b8d5e325e47f0caf02b6bd9edfc (patch) | |
| tree | 2923c250df14404896089bde6ffa990ea276d66c /builtin/commit-graph.c | |
| parent | 54f98fee5069f50c6e96687504b82a7695c8648a (diff) | |
checkout/restore: add basic tests for --merge
Even though "checkout --merge -- paths" had some tests, we never
made sure it worked to recreate the conflicted state _after_ the
resolution was recorded in the index. Also "restore --merge" did
not even have any tests.
Currently these commands use the unmerge_marked_index() interface
that cannot handle paths that have been resolved as removal, and
tests for that case are marked with test_expect_failure; these
should eventually be fixed, but not in this patch.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit-graph.c')
0 files changed, 0 insertions, 0 deletions