equal
deleted
inserted
replaced
139 |
139 |
140 |
140 |
141 $ cat > $EDITED <<EOF |
141 $ cat > $EDITED <<EOF |
142 > pick 617f94f13c0f 1 +4 |
142 > pick 617f94f13c0f 1 +4 |
143 > drop 888f9082bf99 2 +5 |
143 > drop 888f9082bf99 2 +5 |
144 > pick 251d831eeec5 3 +6 |
144 > fold 251d831eeec5 3 +6 |
145 > EOF |
145 > EOF |
146 |
146 |
147 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 1 |
147 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 1 |
148 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
148 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149 merging file |
149 merging file |