equal
deleted
inserted
replaced
408 abort: outstanding uncommitted merge |
408 abort: outstanding uncommitted merge |
409 (requires --allow-dirty-working-copy to uncommit) |
409 (requires --allow-dirty-working-copy to uncommit) |
410 [20] |
410 [20] |
411 |
411 |
412 $ hg uncommit --config experimental.uncommitondirtywdir=True |
412 $ hg uncommit --config experimental.uncommitondirtywdir=True |
413 abort: cannot uncommit while merging |
413 abort: cannot uncommit changesets while merging |
414 [20] |
414 [20] |
415 |
415 |
416 $ hg status |
416 $ hg status |
417 M a |
417 M a |
418 $ hg commit -m 'merge a and b' |
418 $ hg commit -m 'merge a and b' |