equal
deleted
inserted
replaced
105 |
105 |
106 |
106 |
107 |
107 |
108 rollup will fold without preserving the folded commit's message |
108 rollup will fold without preserving the folded commit's message |
109 |
109 |
|
110 $ OLDHGEDITOR=$HGEDITOR |
|
111 $ HGEDITOR=false |
110 $ hg histedit d2ae7f538514 --commands - 2>&1 <<EOF | fixbundle |
112 $ hg histedit d2ae7f538514 --commands - 2>&1 <<EOF | fixbundle |
111 > pick d2ae7f538514 b |
113 > pick d2ae7f538514 b |
112 > roll ee283cb5f2d5 e |
114 > roll ee283cb5f2d5 e |
113 > pick 6de59d13424a f |
115 > pick 6de59d13424a f |
114 > pick 9c277da72c9b d |
116 > pick 9c277da72c9b d |
117 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
119 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
118 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
120 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
119 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
121 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
120 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
122 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
121 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
123 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
124 |
|
125 $ HGEDITOR=$OLDHGEDITOR |
122 |
126 |
123 log after edit |
127 log after edit |
124 $ hg logt --graph |
128 $ hg logt --graph |
125 @ 3:c4a9eb7989fc d |
129 @ 3:c4a9eb7989fc d |
126 | |
130 | |