Mercurial > hg
comparison tests/test-largefiles-update.t @ 30060:a145161debed
merge: use labels in subrepo merge
This is the last place that doesn't respect conflict labels in merge output.
Teach subrepos to use subrepo merge output too.
| author | Simon Farnsworth <simonfar@fb.com> |
|---|---|
| date | Sat, 08 Oct 2016 01:25:28 -0700 |
| parents | 978b907d9b36 |
| children | 438173c41587 |
comparison
equal
deleted
inserted
replaced
| 30059:6ffb7e0249f4 | 30060:a145161debed |
|---|---|
| 544 > r | 544 > r |
| 545 > l | 545 > l |
| 546 > l | 546 > l |
| 547 > EOF | 547 > EOF |
| 548 subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9) | 548 subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9) |
| 549 (M)erge, keep (l)ocal or keep (r)emote? m | 549 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
| 550 subrepository sources for sub differ (in checked out version) | 550 subrepository sources for sub differ (in checked out version) |
| 551 use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)? r | 551 use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)? r |
| 552 remote turned local largefile large2 into a normal file | 552 remote turned local largefile large2 into a normal file |
| 553 keep (l)argefile or use (n)ormal file? l | 553 keep (l)argefile or use (n)ormal file? l |
| 554 largefile large1 has a merge conflict | 554 largefile large1 has a merge conflict |