Mercurial > hg
view tests/test-extra-filelog-entry @ 6521:a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
It is possible to specify that one of the internal merge tools (internal:fail,
internal:local or internal:other) should be used for performing merges on files
matching a given pattern. This test makes sure that such a setting actually
works.
author | Dov Feldstern <dfeldstern@fastimap.com> |
---|---|
date | Fri, 04 Apr 2008 02:20:58 +0300 |
parents | b51a8138292a |
children |
line wrap: on
line source
#!/bin/sh # # test for issue351 # Environement setup for MQ echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH #Repo init hg init hg qinit echo b > b hg ci -A -m foo echo cc > b hg qnew -f foo.diff echo b > b hg qrefresh hg debugindex .hg/store/data/b.i