Mercurial > hg
comparison tests/test-merge-tools @ 7785:660c8dd44060
test-merge-tool: Make sure no hgmerge can be found in $PATH
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 10 Feb 2009 22:47:38 +0100 |
parents | 8c06d4bf2c23 |
children | 1cb6836946be |
comparison
equal
deleted
inserted
replaced
7784:8a217626bb0c | 7785:660c8dd44060 |
---|---|
56 echo | 56 echo |
57 echo Tool selection | 57 echo Tool selection |
58 echo | 58 echo |
59 | 59 |
60 echo "# default is internal merge:" | 60 echo "# default is internal merge:" |
61 domerge -r 2 | 61 beforemerge |
62 echo "# hg merge -r 2" | |
63 PATH=$BINDIR hg merge -r 2 | |
64 aftermerge | |
62 | 65 |
63 echo "# simplest hgrc using false for merge:" | 66 echo "# simplest hgrc using false for merge:" |
64 echo "false.whatever=" >> .hg/hgrc | 67 echo "false.whatever=" >> .hg/hgrc |
65 domerge -r 2 | 68 domerge -r 2 |
66 | 69 |