Show More
@@ -208,6 +208,7 b' def _picktool(repo, ui, path, binary, sy' | |||||
208 | if uimerge: |
|
208 | if uimerge: | |
209 | # external tools defined in uimerge won't be able to handle |
|
209 | # external tools defined in uimerge won't be able to handle | |
210 | # change/delete conflicts |
|
210 | # change/delete conflicts | |
|
211 | if check(uimerge, path, symlink, binary, changedelete): | |||
211 | if uimerge not in names and not changedelete: |
|
212 | if uimerge not in names and not changedelete: | |
212 | return (uimerge, uimerge) |
|
213 | return (uimerge, uimerge) | |
213 | tools.insert(0, (None, uimerge)) # highest priority |
|
214 | tools.insert(0, (None, uimerge)) # highest priority |
@@ -1748,7 +1748,9 b' missingbinary is a merge-tool that doesn' | |||||
1748 | missingbinary.executable=doesnotexist |
|
1748 | missingbinary.executable=doesnotexist | |
1749 | # hg update -C 1 |
|
1749 | # hg update -C 1 | |
1750 | $ hg merge -y -r 2 --config ui.merge=missingbinary |
|
1750 | $ hg merge -y -r 2 --config ui.merge=missingbinary | |
|
1751 | couldn't find merge tool missingbinary (for pattern f) | |||
1751 | merging f |
|
1752 | merging f | |
|
1753 | couldn't find merge tool missingbinary (for pattern f) | |||
1752 | revision 1 |
|
1754 | revision 1 | |
1753 | space |
|
1755 | space | |
1754 | revision 0 |
|
1756 | revision 0 |
General Comments 0
You need to be logged in to leave comments.
Login now