equal
deleted
inserted
replaced
955 M f-unchanged-1 |
955 M f-unchanged-1 |
956 M f-unchanged-2 |
956 M f-unchanged-2 |
957 $ hg merge |
957 $ hg merge |
958 largefile f-different has a merge conflict |
958 largefile f-different has a merge conflict |
959 ancestor was 09d2af8dd22201dd8d48e5dcfcaed281ff9422c7 |
959 ancestor was 09d2af8dd22201dd8d48e5dcfcaed281ff9422c7 |
960 keep (l)ocal e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e or |
960 you can keep (l)ocal e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e or take (o)ther 7448d8798a4380162d4b56f9b452e2f6f9e24e7a. |
961 take (o)ther 7448d8798a4380162d4b56f9b452e2f6f9e24e7a? l |
961 what do you want to do? l |
962 getting changed largefiles |
962 getting changed largefiles |
963 1 largefiles updated, 0 removed |
963 1 largefiles updated, 0 removed |
964 0 files updated, 4 files merged, 0 files removed, 0 files unresolved |
964 0 files updated, 4 files merged, 0 files removed, 0 files unresolved |
965 (branch merge, don't forget to commit) |
965 (branch merge, don't forget to commit) |
966 $ cat f-different |
966 $ cat f-different |