equal
deleted
inserted
replaced
86 echo "# but true.executable set to cat found in PATH works:" |
86 echo "# but true.executable set to cat found in PATH works:" |
87 echo "true.executable=cat" >> .hg/hgrc |
87 echo "true.executable=cat" >> .hg/hgrc |
88 domerge -r 2 |
88 domerge -r 2 |
89 |
89 |
90 echo "# and true.executable set to cat with path works:" |
90 echo "# and true.executable set to cat with path works:" |
91 domerge -r 2 --config merge-tools.true.executable=/bin/cat |
91 domerge -r 2 --config merge-tools.true.executable=cat |
92 |
|
93 |
92 |
94 echo |
93 echo |
95 echo Tool selection and merge-patterns |
94 echo Tool selection and merge-patterns |
96 echo |
95 echo |
97 |
96 |
166 echo |
165 echo |
167 echo Merge post-processing |
166 echo Merge post-processing |
168 echo |
167 echo |
169 |
168 |
170 echo "# cat is a bad merge-tool and doesn't change:" |
169 echo "# cat is a bad merge-tool and doesn't change:" |
171 domerge -r 2 --config merge-tools.true.checkchanged=1 |
170 domerge -y -r 2 --config merge-tools.true.checkchanged=1 |