Rev 6567: Don't explain gory details, most users won't care. in file:///home/vila/src/bzr/cleanup/mergetool-doc/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/cleanup/mergetool-doc/

------------------------------------------------------------
revno: 6567
revision-id: v.ladeuil+lp at free.fr-20121010182835-mb3r5c7ntbsl12jq
parent: v.ladeuil+lp at free.fr-20120919121000-1gxj7s5t1ckct9eg
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: mergetool-doc
timestamp: Wed 2012-10-10 20:28:35 +0200
message:
  Don't explain gory details, most users won't care.
-------------- next part --------------
=== modified file 'bzrlib/help_topics/en/configuration.txt'
--- a/bzrlib/help_topics/en/configuration.txt	2012-09-19 12:10:00 +0000
+++ b/bzrlib/help_topics/en/configuration.txt	2012-10-10 18:28:35 +0000
@@ -713,18 +713,16 @@
 
   bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}
 
-The markers above are not regular configuration options, they are provided
-explicitly during conflit resolutions (as opposed to configuration
-files). As such, when defining templates be careful of the following
-caveat::
+Because mergetool and config itself both use curly braces as interpolation
+markers, trying to display the mergetool line results in the following
+problem::
+
 
   $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o {result}'
   $ bzr config bzr.mergetool.kdiff3
   bzr: ERROR: Option base is not defined while expanding "kdiff3 {base} {this} {other} -o {result}".
 
-Since ``bzr config`` is used here outside of any conflict resolution, there
-is no way for the markers to be defined. Instead, to disable option
-expansion in this particular case, one should use::
+To avoid this, config can be instructed not to try expanding variables::
 
   $ bzr config --all bzr.mergetool.kdiff3
   branch: