Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: update with new graft output
authorDurham Goode <durham@fb.com>
Tue, 19 Jan 2016 15:30:23 -0800
changeset 1587 ea7523380efa
parent 1586 91e67ad4cb6c
child 1588 983f2e4dbe5d
test: update with new graft output Graft now has a --continue it seems. We need to update our test output.
tests/test-evolve.t file | annotate | diff | comparison | revisions 
--- a/tests/test-evolve.t	Sun Jan 17 22:02:44 2016 -0800
+++ b/tests/test-evolve.t	Tue Jan 19 15:30:23 2016 -0800
@@ -601,6 +601,7 @@
   $ echo 3 > 1
   $ hg resolve -m 1
   (no more unresolved files)
+  continue: hg graft --continue
   $ hg graft --continue -O
   grafting 7:a5bfd90a2f29 "conflict" (tip)
   $ glog --hidden
evolve