Mercurial > evolve
comparison tests/test-stabilize-conflict.t @ 986:c1f8ece4182d
evolve: add --tool option so we don't have to use HGMERGE
| author | Greg Ward <greg@gerg.ca> |
|---|---|
| date | Sun, 22 Jun 2014 20:10:07 -0400 |
| parents | b286f77d680c |
| children | 574315ec19c2 |
comparison
equal
deleted
inserted
replaced
| 985:6a37044ec0b3 | 986:c1f8ece4182d |
|---|---|
| 207 -ten | 207 -ten |
| 208 +zehn | 208 +zehn |
| 209 $ hg amend | 209 $ hg amend |
| 210 1 new unstable changesets | 210 1 new unstable changesets |
| 211 $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH | 211 $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH |
| 212 $ HGMERGE=touch hg evolve <<EOF | 212 $ hg evolve --tool touch <<EOF |
| 213 > n | 213 > n |
| 214 > EOF | 214 > EOF |
| 215 move:[8] babar count up to fifteen | 215 move:[8] babar count up to fifteen |
| 216 atop:[10] babar count up to ten | 216 atop:[10] babar count up to ten |
| 217 merging babar | 217 merging babar |