Show More
@@ -354,6 +354,10 b' Add and expect uncommit to fail on both ' | |||||
354 | abort: outstanding uncommitted merge |
|
354 | abort: outstanding uncommitted merge | |
355 | [255] |
|
355 | [255] | |
356 |
|
356 | |||
|
357 | $ hg uncommit --config experimental.uncommitondirtywdir=True | |||
|
358 | abort: cannot uncommit while merging | |||
|
359 | [255] | |||
|
360 | ||||
357 | $ hg status |
|
361 | $ hg status | |
358 | M a |
|
362 | M a | |
359 | $ hg commit -m 'merge a and b' |
|
363 | $ hg commit -m 'merge a and b' |
General Comments 0
You need to be logged in to leave comments.
Login now