##// END OF EJS Templates
tests: demonstrate that no requested merge tool is ignored if missing...
Martin von Zweigbergk -
r38986:6bfd1054 default
parent child Browse files
Show More
@@ -1737,6 +1737,27 b" cat is a bad merge-tool and doesn't chan"
1737 # hg resolve --list
1737 # hg resolve --list
1738 U f
1738 U f
1739
1739
1740 missingbinary is a merge-tool that doesn't exist:
1741
1742 $ echo "missingbinary.executable=doesnotexist" >> .hg/hgrc
1743 $ beforemerge
1744 [merge-tools]
1745 false.whatever=
1746 true.priority=1
1747 true.executable=cat
1748 missingbinary.executable=doesnotexist
1749 # hg update -C 1
1750 $ hg merge -y -r 2 --config ui.merge=missingbinary
1751 merging f
1752 revision 1
1753 space
1754 revision 0
1755 space
1756 revision 2
1757 space
1758 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
1759 (branch merge, don't forget to commit)
1760
1740 #if symlink
1761 #if symlink
1741
1762
1742 internal merge cannot handle symlinks and shouldn't try:
1763 internal merge cannot handle symlinks and shouldn't try:
@@ -1790,6 +1811,7 b' specified file as expected'
1790 false.whatever=
1811 false.whatever=
1791 true.priority=1
1812 true.priority=1
1792 true.executable=cat
1813 true.executable=cat
1814 missingbinary.executable=doesnotexist
1793 # hg update -C 1
1815 # hg update -C 1
1794
1816
1795 (default behavior: checking files in the working parent context)
1817 (default behavior: checking files in the working parent context)
General Comments 0
You need to be logged in to leave comments. Login now