equal
deleted
inserted
replaced
125 largefile large1 has a merge conflict |
125 largefile large1 has a merge conflict |
126 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
126 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
127 keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or |
127 keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or |
128 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o |
128 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o |
129 merging normal1 |
129 merging normal1 |
130 warning: conflicts during merge. |
130 warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark') |
131 merging normal1 incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
132 getting changed largefiles |
131 getting changed largefiles |
133 1 largefiles updated, 0 removed |
132 1 largefiles updated, 0 removed |
134 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
133 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
135 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
134 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
136 [1] |
135 [1] |
553 largefile large1 has a merge conflict |
552 largefile large1 has a merge conflict |
554 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
553 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
555 keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or |
554 keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or |
556 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o |
555 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o |
557 merging normal1 |
556 merging normal1 |
558 warning: conflicts during merge. |
557 warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark') |
559 merging normal1 incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
560 unresolved conflicts (see hg resolve, then hg rebase --continue) |
558 unresolved conflicts (see hg resolve, then hg rebase --continue) |
561 [1] |
559 [1] |
562 $ cat .hglf/large1 |
560 $ cat .hglf/large1 |
563 58e24f733a964da346e2407a2bee99d9001184f5 |
561 58e24f733a964da346e2407a2bee99d9001184f5 |
564 $ cat large1 |
562 $ cat large1 |