Mercurial > public > mercurial-scm > hg
diff tests/test-rebase-conflicts.t @ 48588: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 | 74973a6d4e67 |
| children | e1953a34c110 |
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t Thu Jan 20 11:06:52 2022 -0800 +++ b/tests/test-rebase-conflicts.t Tue Jan 18 14:57:15 2022 -0800 @@ -372,13 +372,13 @@ +++ b/a * (glob) @@ -1,2 +1,8 @@ a - +<<<<<<< dest: 328e4ab1f7cc ab - test: ab + +<<<<<<< dest: 328e4ab1f7cc ab - test: ab b - +||||||| base: cb9a9f314b8b - test: a + +||||||| parent of source: cb9a9f314b8b - test: a +======= +b +c - +>>>>>>> source: 7bc217434fc1 - test: abc + +>>>>>>> source: 7bc217434fc1 - test: abc Test rebase with obsstore turned on and off (issue5606)