equal
deleted
inserted
replaced
111 $ ls |
111 $ ls |
112 a |
112 a |
113 |
113 |
114 $ hg merge |
114 $ hg merge |
115 temporarily included 1 file(s) in the sparse checkout for merging |
115 temporarily included 1 file(s) in the sparse checkout for merging |
116 file 'd' was deleted in local [working copy] but was modified in other [merge rev]. |
116 file 'd' was deleted in other [merge rev] but was modified in local [working copy]. |
117 What do you want to do? |
117 What do you want to do? |
118 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
118 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
119 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
119 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
120 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
120 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
121 [1] |
121 [1] |