equal
deleted
inserted
replaced
74 -huit |
74 -huit |
75 +eight |
75 +eight |
76 neuf |
76 neuf |
77 dix |
77 dix |
78 $ hg amend |
78 $ hg amend |
79 1 new unstable changesets |
79 1 new orphan changesets |
80 $ hg evolve |
80 $ hg evolve |
81 move:[2] babar count up to fifteen |
81 move:[2] babar count up to fifteen |
82 atop:[4] babar count up to ten |
82 atop:[4] babar count up to ten |
83 merging babar |
83 merging babar |
84 working directory is now at 71c18f70c34f |
84 working directory is now at 71c18f70c34f |
120 eight |
120 eight |
121 neuf |
121 neuf |
122 -dix |
122 -dix |
123 +ten |
123 +ten |
124 $ hg amend |
124 $ hg amend |
125 1 new unstable changesets |
125 1 new orphan changesets |
126 $ hg evolve |
126 $ hg evolve |
127 move:[5] babar count up to fifteen |
127 move:[5] babar count up to fifteen |
128 atop:[7] babar count up to ten |
128 atop:[7] babar count up to ten |
129 merging babar |
129 merging babar |
130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') |
130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') |
207 eight |
207 eight |
208 neuf |
208 neuf |
209 -ten |
209 -ten |
210 +zehn |
210 +zehn |
211 $ hg amend |
211 $ hg amend |
212 1 new unstable changesets |
212 1 new orphan changesets |
213 $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH |
213 $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH |
214 $ hg evolve --tool touch <<EOF |
214 $ hg evolve --tool touch <<EOF |
215 > n |
215 > n |
216 > EOF |
216 > EOF |
217 move:[8] babar count up to fifteen |
217 move:[8] babar count up to fifteen |