Mercurial Mercurial > hg-stable / 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-convert-cvs-detectmerge.t
changeset 20117 aa9385f983fa
parent 18376 13d73bf6be29
child 22046 7a9cbb315d84 
--- a/tests/test-convert-cvs-detectmerge.t	Fri Nov 22 19:13:26 2013 +0100
+++ b/tests/test-convert-cvs-detectmerge.t	Fri Nov 22 19:14:17 2013 +0100
@@ -24,7 +24,6 @@
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "convert = " >> $HGRCPATH
-  $ echo "graphlog = " >> $HGRCPATH
   $ echo "[convert]" >> $HGRCPATH
   $ echo "cvsps.cache=0" >> $HGRCPATH
   $ echo "cvsps.mergefrom=\[MERGE from (\S+)\]" >> $HGRCPATH
@@ -210,7 +209,7 @@
 
 graphical log
 
-  $ hg -R proj.hg glog --template="$template"
+  $ hg -R proj.hg log -G --template="$template"
   o  9: '' fix file1 [MERGE from v1-1]
   |
   | o  8: 'v1_1' fix file1
hg-stable