Mercurial > hg > hg-git

diff tests/test-conflict-1.t @ 527:bc7b18c2e5ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove configuration of bookmarks extension All of our supported Hg versions include bookmarks in core. Thus, actovating it in the hgrc and setting bookmarks.track.current are no longer needed.
author David M. Carr <david@carrclan.us>
date Thu, 13 Sep 2012 20:48:11 -0400
parents 0f8fa80158e8
children e48a3f30b73c
line wrap: on
line diff
--- a/tests/test-conflict-1.t
+++ b/tests/test-conflict-1.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ hg init hgrepo1
   $ cd hgrepo1