equal
deleted
inserted
replaced
1373 added 2 changesets with 4 changes to 4 files (+1 heads) |
1373 added 2 changesets with 4 changes to 4 files (+1 heads) |
1374 (run 'hg heads' to see heads, 'hg merge' to merge) |
1374 (run 'hg heads' to see heads, 'hg merge' to merge) |
1375 2 largefiles cached |
1375 2 largefiles cached |
1376 $ hg merge |
1376 $ hg merge |
1377 largefile sub/large4 has a merge conflict |
1377 largefile sub/large4 has a merge conflict |
1378 keep (l)ocal or take (o)ther? l |
1378 ancestor was 971fb41e78fea4f8e0ba5244784239371cb00591 |
|
1379 keep (l)ocal d846f26643bfa8ec210be40cc93cc6b7ff1128ea or |
|
1380 take (o)ther e166e74c7303192238d60af5a9c4ce9bef0b7928? l |
1379 3 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1381 3 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1380 (branch merge, don't forget to commit) |
1382 (branch merge, don't forget to commit) |
1381 getting changed largefiles |
1383 getting changed largefiles |
1382 1 largefiles updated, 0 removed |
1384 1 largefiles updated, 0 removed |
1383 $ hg commit -m "Merge repos e and f" |
1385 $ hg commit -m "Merge repos e and f" |