← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help_topics/en/configuration.txt

  • Committer: Vincent Ladeuil
  • Date: 2011-05-14 14:10:56 UTC
  • mto: This revision was merged to the branch mainline in revision 5864.
  • Revision ID: v.ladeuil+lp@free.fr-20110514141056-t1i6suc9fax6iuf9
https://launchpad.net/bugs/782289
Fix some ReST typos in the configuration help and restore the workaround for dotted format names breaking sphinx.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics/en/configuration.txt
603
603
executable may omit its path if it can be found on the PATH.
604
604
 
605
605
The following markers can be used in the command-line to substitute filenames
606
 
involved in the merge conflict:
607
 
 
608
 
{base}      file.BASE
609
 
{this}      file.THIS
610
 
{other}     file.OTHER
611
 
{result}    output file
612
 
{this_temp} temp copy of file.THIS, used to overwrite output file if merge
613
 
            succeeds.
614
 
 
615
 
For example:
 
606
involved in the merge conflict::
 
607
 
 
608
  {base}      file.BASE
 
609
  {this}      file.THIS
 
610
  {other}     file.OTHER
 
611
  {result}    output file
 
612
  {this_temp} temp copy of file.THIS, used to overwrite output file if merge
 
613
              succeeds.
 
614
 
 
615
For example::
616
616
 
617
617
  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}
618
618
 
619
619
bzr.default_mergetool
620
 
~~~~~~~~~~~~~~~~~
 
620
~~~~~~~~~~~~~~~~~~~~~
621
621
 
622
622
Specifies which external merge tool (as defined above) should be selected by
623
623
default in tools such as ``bzr qconflicts``.
624
624
 
625
 
For example:
 
625
For example::
626
626
 
627
627
  bzr.default_mergetool = kdiff3