Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/tests/test-largefiles-update.t Fri Oct 07 08:32:18 2016 -0400 +++ b/tests/test-largefiles-update.t Sat Oct 08 01:25:28 2016 -0700 @@ -546,7 +546,7 @@ > l > EOF subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9) - (M)erge, keep (l)ocal or keep (r)emote? m + (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m subrepository sources for sub differ (in checked out version) use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)? r remote turned local largefile large2 into a normal file