Show More
| @@ -810,7 +810,9 b' Amend a merge changeset (with manifest-l' | |||||
| 810 | $ hg up -q default |
|
810 | $ hg up -q default | |
| 811 | $ echo aa >> aa |
|
811 | $ echo aa >> aa | |
| 812 | $ hg ci -m aa |
|
812 | $ hg ci -m aa | |
| 813 | $ hg merge -q bar |
|
813 | $ hg merge -q bar --config ui.interactive=True << EOF | |
|
|
814 | > c | |||
|
|
815 | > EOF | |||
| 814 | local changed aa which remote deleted |
|
816 | local changed aa which remote deleted | |
| 815 | use (c)hanged version, (d)elete, or leave (u)nresolved? c |
|
817 | use (c)hanged version, (d)elete, or leave (u)nresolved? c | |
| 816 | $ hg ci -m 'merge bar (with conflicts)' |
|
818 | $ hg ci -m 'merge bar (with conflicts)' | |
General Comments 0
You need to be logged in to leave comments.
Login now