Mercurial > hg

comparison tests/test-merge-tools.t @ 15524:e7119b091809

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew
author Matt Mackall <mpm@selenic.com>
date Thu, 17 Nov 2011 23:02:18 -0600
parents 2371f4aea665 bb9ad375b51c
children 2607de602105
comparison
equal deleted inserted replaced
15523:f9da84a950d0 15524:e7119b091809
1 $ "$TESTDIR/hghave" system-sh || exit 80
2
1 test merge-tools configuration - mostly exercising filemerge.py 3 test merge-tools configuration - mostly exercising filemerge.py
2 4
3 $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test 5 $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test
4 $ hg init 6 $ hg init
5 7