equal
deleted
inserted
replaced
50 > edit 7d5187087c79 3 four |
50 > edit 7d5187087c79 3 four |
51 > EOF |
51 > EOF |
52 merging file |
52 merging file |
53 Editing (7d5187087c79), you may commit or record as needed now. |
53 Editing (7d5187087c79), you may commit or record as needed now. |
54 (hg histedit --continue to resume) |
54 (hg histedit --continue to resume) |
55 [1] |
55 [240] |
56 $ hg abort |
56 $ hg abort |
57 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
57 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
58 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/1d8f701c7b35-cf7be322-backup.hg |
58 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/1d8f701c7b35-cf7be322-backup.hg |
59 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/5c0056670bce-b54b65d0-backup.hg |
59 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/5c0056670bce-b54b65d0-backup.hg |
60 |
60 |
72 > edit 7d5187087c79 3 four |
72 > edit 7d5187087c79 3 four |
73 > EOF |
73 > EOF |
74 merging file |
74 merging file |
75 Editing (7d5187087c79), you may commit or record as needed now. |
75 Editing (7d5187087c79), you may commit or record as needed now. |
76 (hg histedit --continue to resume) |
76 (hg histedit --continue to resume) |
77 [1] |
77 [240] |
78 |
78 |
79 $ hg abort |
79 $ hg abort |
80 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
80 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |