equal
deleted
inserted
replaced
130 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
130 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
131 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
131 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
132 [1] |
132 [1] |
133 $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat |
133 $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat |
134 $ hg resolve -m stuff/maybelarge.dat |
134 $ hg resolve -m stuff/maybelarge.dat |
135 no unresolved files; you may continue your unfinished operation |
135 no more unresolved files |
136 $ hg commit -m"merge" |
136 $ hg commit -m"merge" |
137 $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" |
137 $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" |
138 @ 5:4884f215abda merge |
138 @ 5:4884f215abda merge |
139 |\ |
139 |\ |
140 | o 4:7285f817b77e remove large, normal3 |
140 | o 4:7285f817b77e remove large, normal3 |