Mercurial > public > mercurial-scm > hg
diff tests/test-sparse.t @ 48589:a51c522c0064
merge: set custom conflict label for base commit
Differential Revision: https://phab.mercurial-scm.org/D12021
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 18 Jan 2022 15:04:55 -0800 |
| parents | 402a6b6173e9 |
| children | a6efb9180764 |
line wrap: on
line diff
--- a/tests/test-sparse.t Tue Jan 18 14:57:15 2022 -0800 +++ b/tests/test-sparse.t Tue Jan 18 15:04:55 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