Mercurial > hg
annotate tests/test-hup.out @ 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 | dd5a501cb97f |
children | a685011ed38e |
rev | line source |
---|---|
642 | 1 0 |
2 0 | |
3 adding changesets | |
4 transaction abort! | |
5 rollback completed | |
4970
30d4d8985dd8
transactions: avoid late tear-down (issue641)
Matt Mackall <mpm@selenic.com>
parents:
4269
diff
changeset
|
6 killed! |
5814
dd5a501cb97f
restore branch after rollback (issue 902)
Alexandre Vassalotti <mercurial-bugs@selenic.com>
parents:
4970
diff
changeset
|
7 .hg/00changelog.i .hg/journal.branch .hg/journal.dirstate .hg/requires .hg/store .hg/store/00changelog.i .hg/store/00changelog.i.a |