equal
deleted
inserted
replaced
433 --- a/main-file-1 |
433 --- a/main-file-1 |
434 +++ b/main-file-1 |
434 +++ b/main-file-1 |
435 @@ -3,1 +3,1 @@ |
435 @@ -3,1 +3,1 @@ |
436 -Zwei |
436 -Zwei |
437 +deux |
437 +deux |
438 $ hg log -r 'bumped()' # no more bumped |
438 $ hg log -r 'phasedivergent()' # no more bumped |
439 |
439 |
440 test evolve --all |
440 test evolve --all |
441 $ sed -i'' -e s/deux/to/ main-file-1 |
441 $ sed -i'' -e s/deux/to/ main-file-1 |
442 $ hg commit -m 'dansk 2!' |
442 $ hg commit -m 'dansk 2!' |
443 $ sed -i'' -e s/Three/tre/ main-file-1 |
443 $ sed -i'' -e s/Three/tre/ main-file-1 |