equal
deleted
inserted
replaced
199 -ten |
199 -ten |
200 +zehn |
200 +zehn |
201 $ hg amend |
201 $ hg amend |
202 1 new unstable changesets |
202 1 new unstable changesets |
203 $ sed -i'' 's/interactive=.*/interactive=true/' $HGRCPATH |
203 $ sed -i'' 's/interactive=.*/interactive=true/' $HGRCPATH |
204 $ yes n 2> ../shutup | HGMERGE=touch hg evolve |
204 $ HGMERGE=touch hg evolve <<EOF |
|
205 > n |
|
206 > EOF |
205 move:[8] babar count up to fifteen |
207 move:[8] babar count up to fifteen |
206 atop:[10] babar count up to ten |
208 atop:[10] babar count up to ten |
207 merging babar |
209 merging babar |
208 output file babar appears unchanged |
210 output file babar appears unchanged |
209 was merge successful (yn)? merging babar failed! |
211 was merge successful (yn)? merging babar failed! |