Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
48587:3c8cc987672e | 48588:402a6b6173e9 |
---|---|
370 diff -r 328e4ab1f7cc a | 370 diff -r 328e4ab1f7cc a |
371 --- a/a Thu Jan 01 00:00:00 1970 +0000 | 371 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
372 +++ b/a * (glob) | 372 +++ b/a * (glob) |
373 @@ -1,2 +1,8 @@ | 373 @@ -1,2 +1,8 @@ |
374 a | 374 a |
375 +<<<<<<< dest: 328e4ab1f7cc ab - test: ab | 375 +<<<<<<< dest: 328e4ab1f7cc ab - test: ab |
376 b | 376 b |
377 +||||||| base: cb9a9f314b8b - test: a | 377 +||||||| parent of source: cb9a9f314b8b - test: a |
378 +======= | 378 +======= |
379 +b | 379 +b |
380 +c | 380 +c |
381 +>>>>>>> source: 7bc217434fc1 - test: abc | 381 +>>>>>>> source: 7bc217434fc1 - test: abc |
382 | 382 |
383 Test rebase with obsstore turned on and off (issue5606) | 383 Test rebase with obsstore turned on and off (issue5606) |
384 | 384 |
385 $ cd $TESTTMP | 385 $ cd $TESTTMP |
386 $ hg init b | 386 $ hg init b |