Comment 3 for bug 996401

> how do you actually specify a working merge tool line?

No expansion occurs when a value is set, so there is no problem there. This bug report is about displaying the value (which the first command set correctly).

> Wouter found that {{x}} also didn't work as escaping.

1) Rightly so, {{x}} with x = y expands as {y}, this is a supported feature.

2) Since setting a value doesn't try to expand it, there is nothing to escape from.

Overall, the doc should mention the difference between:

- 'bzr config <option>' which displays the expanded value for the option

- 'bzr config --all <regexp>' which displays the raw values

I.e.:

vila:~/src/bzr/trunk :) $ bzr config bzr.mergetool.MyCoolMergeTool='mycoolmergetool --wait {this} {other} {result} {base}'
vila:~/src/bzr/trunk :) $ bzr config bzr.mergetool.MyCoolMergeTool
bzr: ERROR: Option this is not defined while expanding "mycoolmergetool --wait {this} {other} {result} {base}".
vila:~/src/bzr/trunk :( $ bzr config --all bzr.mergetool.MyCoolMergeTool
branch:
  bzr.mergetool.MyCoolMergeTool = mycoolmergetool --wait {this} {other} {result} {base}