equal
deleted
inserted
replaced
212 > 3 |
212 > 3 |
213 > 4 |
213 > 4 |
214 > 5 |
214 > 5 |
215 > EOF |
215 > EOF |
216 $ hg resolve --mark file |
216 $ hg resolve --mark file |
217 $ hg commit -m '+5.2' --config 'extensions.histedit=!' |
217 $ hg commit -m '+5.2' |
218 created new head |
218 created new head |
219 $ echo 6 >> file |
219 $ echo 6 >> file |
220 $ HGEDITOR=cat hg histedit --continue |
220 $ HGEDITOR=cat hg histedit --continue |
221 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
221 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
222 +4 |
222 +4 |