442 

   443 Test that --merge still works fine with commands.update.check set

   444 

   445 XXX: yes we want --merge and we passed that!

   446   $ echo hi > bar

   447   $ echo bar >> bar

   448   $ hg next --merge

   449   abort: conflicting changes

   450   (do you want --merge?)

   451   [255]

   452 

   453 Testing --merge works with other values of commands.update.check also

   454 

   455 XXX: things are broken!

   456   $ hg prev --merge --config commands.update.check=abort

   457   abort: uncommitted changes

   458   (do you want --merge?)

   459   [255]

   460 

   461   $ hg revert --all

   462   forgetting bar

   463   reverting wat

   464 

   465   $ echo bar > bar

   466   $ hg add bar

   467 

   468   $ hg next --merge --config commands.update.check=abort

   469   abort: uncommitted changes

   470   (do you want --merge?)

   471   [255]