Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-prev-next.t
changeset 4476 f0bda6a6d93b
parent 4475 256b28ce03e3
child 4512 7a779a288793
child 4576 96ce1030d2fb 
--- a/tests/test-prev-next.t	Fri Apr 05 22:28:07 2019 +0200
+++ b/tests/test-prev-next.t	Tue Apr 02 12:41:57 2019 +0530
@@ -443,7 +443,6 @@
 
 Test that --merge still works fine with commands.update.check set
 
-XXX: yes we want --merge and we passed that!
   $ hg config commands.update.check
   noconflict
   $ echo hi > bar
@@ -465,7 +464,6 @@
 
 Testing --merge works with other values of commands.update.check also
 
-XXX: things are broken!
   $ hg prev --config commands.update.check=abort
   abort: uncommitted changes
   (do you want --merge?)
evolve