/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/en/user-guide/resolving_conflicts.txt

  • Committer: Jelmer Vernooij
  • Date: 2017-07-30 18:38:48 UTC
  • mfrom: (6740.1.1 breezy-conf-1)
  • Revision ID: jelmer@jelmer.uk-20170730183848-195b9ch7sclkxmqs
Merge lp:~jelmer/brz/breezy-conf

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/resolving_conflicts.txt
77
77
specify all conflicted files.
78
78
 
79
79
The ``extmerge`` command uses the tool specified by the
80
 
``external_merge`` setting in your ``bazaar.conf`` file.
 
80
``external_merge`` setting in your ``breezy.conf`` file.
81
81
If not set, it will look for some popular merge tools such
82
82
as ``kdiff3`` or ``opendiff``, the latter being a command
83
83
line interface to the FileMerge utility in OS X.