Mercurial > public > mercurial-scm > hg-stable
diff tests/test-sparse.t @ 48610:402a6b6173e9
rebase: set custom conflict label for base commit
Differential Revision: https://phab.mercurial-scm.org/D12020
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 18 Jan 2022 14:57:15 -0800 |
| parents | 7bdfd88251c0 |
| children | a51c522c0064 |
line wrap: on
line diff
--- a/tests/test-sparse.t Thu Jan 20 11:06:52 2022 -0800 +++ b/tests/test-sparse.t Tue Jan 18 14:57:15 2022 -0800 @@ -211,11 +211,11 @@ hide $ cat hide - <<<<<<< dest: 39278f7c08a9 - test: two + <<<<<<< dest: 39278f7c08a9 - test: two y ======= z - >>>>>>> source: b91df4f39e75 - test: edit hide + >>>>>>> source: b91df4f39e75 - test: edit hide Verify aborting a rebase cleans up temporary files