equal
deleted
inserted
replaced
83 $ hg histedit --abort 2>&1 | fixbundle |
83 $ hg histedit --abort 2>&1 | fixbundle |
84 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
84 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
85 |
85 |
86 log after abort |
86 log after abort |
87 $ hg resolve -l |
87 $ hg resolve -l |
88 abort: resolve command not applicable when not merging |
|
89 [255] |
|
90 $ hg log --graph |
88 $ hg log --graph |
91 @ changeset: 6:bfa474341cc9 |
89 @ changeset: 6:bfa474341cc9 |
92 | tag: tip |
90 | tag: tip |
93 | user: test |
91 | user: test |
94 | date: Thu Jan 01 00:00:00 1970 +0000 |
92 | date: Thu Jan 01 00:00:00 1970 +0000 |