217   false.whatever=

   217   false.whatever=

   218   true.priority=1

   218   true.priority=1

   219   true.executable=cat

   219   true.executable=cat

   220   # hg update -C 1

   220   # hg update -C 1

   221   # hg merge -r 2

   221   # hg merge -r 2

   222   revision 1

   223   revision 1

   223   space

   224   space

   224   revision 0

   225   revision 0

   225   space

   226   space

   226   revision 2

   227   revision 2

   227   space

   228   space

   229   0 files updated, 1 files merged, 0 files removed, 0 files unresolved

   229   0 files updated, 1 files merged, 0 files removed, 0 files unresolved

   230   (branch merge, don't forget to commit)

   230   (branch merge, don't forget to commit)

   231   # cat f

   231   # cat f

   232   revision 1

   232   revision 1

   233   space

   233   space

   242   false.whatever=

   242   false.whatever=

   243   true.priority=1

   243   true.priority=1

   244   true.executable=cat

   244   true.executable=cat

   245   # hg update -C 1

   245   # hg update -C 1

   246   # hg merge -r 2 --config merge-tools.true.executable=cat

   246   # hg merge -r 2 --config merge-tools.true.executable=cat

   247   revision 1

   248   revision 1

   248   space

   249   space

   249   revision 0

   250   revision 0

   250   space

   251   space

   251   revision 2

   252   revision 2

   252   space

   253   space

   254   0 files updated, 1 files merged, 0 files removed, 0 files unresolved

   254   0 files updated, 1 files merged, 0 files removed, 0 files unresolved

   255   (branch merge, don't forget to commit)

   255   (branch merge, don't forget to commit)

   256   # cat f

   256   # cat f

   257   revision 1

   257   revision 1

   258   space

   258   space

   596   false.whatever=

   596   false.whatever=

   597   true.priority=1

   597   true.priority=1

   598   true.executable=cat

   598   true.executable=cat

   599   # hg update -C 1

   599   # hg update -C 1

   600   # hg merge -r 3 --config merge-tools.true.premerge=False

   600   # hg merge -r 3 --config merge-tools.true.premerge=False

   601   revision 1

   602   revision 1

   602   space

   603   space

   603   revision 0

   604   revision 0

   604   space

   605   space

   605   revision 0

   606   revision 0

   606   space

   607   space

   607   revision 3

   608   revision 3

   609   0 files updated, 1 files merged, 0 files removed, 0 files unresolved

   609   0 files updated, 1 files merged, 0 files removed, 0 files unresolved

   610   (branch merge, don't forget to commit)

   610   (branch merge, don't forget to commit)

   611   # cat f

   611   # cat f

   612   revision 1

   612   revision 1

   613   space

   613   space

   629   true.priority=1

   629   true.priority=1

   630   true.executable=cat

   630   true.executable=cat

   631   # hg update -C 1

   631   # hg update -C 1

   632   $ hg merge -r 2 --config merge-tools.true.executable=head --config merge-tools.true.args='$base $local $other $output' \

   632   $ hg merge -r 2 --config merge-tools.true.executable=head --config merge-tools.true.args='$base $local $other $output' \

   633   >   | sed 's,==> .* <==,==> ... <==,g'

   633   >   | sed 's,==> .* <==,==> ... <==,g'

   634   ==> ... <==

   635   ==> ... <==

   635   revision 0

   636   revision 0

   636   space

   637   space

   637   

   638   

   638   ==> ... <==

   639   ==> ... <==

   644   space

   645   space

   645   

   646   

   646   ==> ... <==

   647   ==> ... <==

   647   revision 1

   648   revision 1

   648   space

   649   space

   650   0 files updated, 1 files merged, 0 files removed, 0 files unresolved

   650   0 files updated, 1 files merged, 0 files removed, 0 files unresolved

   651   (branch merge, don't forget to commit)

   651   (branch merge, don't forget to commit)

   652   $ aftermerge

   652   $ aftermerge

   653   # cat f

   653   # cat f

   654   revision 1

   654   revision 1

   755   false.whatever=

   755   false.whatever=

   756   true.priority=1

   756   true.priority=1

   757   true.executable=cat

   757   true.executable=cat

   758   # hg update -C 1

   758   # hg update -C 1

   759   # hg merge -y -r 2 --config merge-tools.true.checkchanged=1

   759   # hg merge -y -r 2 --config merge-tools.true.checkchanged=1

   760   revision 1

   761   revision 1

   761   space

   762   space

   762   revision 0

   763   revision 0

   763   space

   764   space

   764   revision 2

   765   revision 2

   765   space

   766   space

   767    output file f appears unchanged

   767    output file f appears unchanged

   768   was merge successful (yn)? n

   768   was merge successful (yn)? n

   769   merging f failed!

   769   merging f failed!

   770   0 files updated, 0 files merged, 0 files removed, 1 files unresolved

   770   0 files updated, 0 files merged, 0 files removed, 1 files unresolved

   771   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

   771   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon