equal
deleted
inserted
replaced
1746 true.priority=1 |
1746 true.priority=1 |
1747 true.executable=cat |
1747 true.executable=cat |
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 merging f |
1751 couldn't find merge tool missingbinary (for pattern 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 |
1755 space |
1757 space |
1756 revision 2 |
1758 revision 2 |