diff tests/bzr-definitions @ 20306:fe8e254c7ad6 stable

merge default into stable for 2.9 code freeze
author Matt Mackall <mpm@selenic.com>
date Tue, 21 Jan 2014 14:30:06 -0600
parents aa9385f983fa
children 89872688893f
line wrap: on
line diff
--- a/tests/bzr-definitions	Wed Jan 01 21:46:45 2014 -0600
+++ b/tests/bzr-definitions	Tue Jan 21 14:30:06 2014 -0600
@@ -5,11 +5,10 @@
 TERM=dumb; export TERM
 echo '[extensions]' >> $HGRCPATH
 echo 'convert = ' >> $HGRCPATH
-echo 'hgext.graphlog = ' >> $HGRCPATH
 
 glog()
 {
-    hg glog --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@"
+    hg log -G --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@"
 }
 
 manifest()