← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/changelog_merge/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2011-11-15 17:27:46 UTC
  • mfrom: (6260 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6263.
  • Revision ID: jelmer@samba.org-20111115172746-bznns2ohiexp2g5q
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/changelog_merge/__init__.py
16
16
 
17
17
__doc__ = """Merge hook for GNU-format ChangeLog files
18
18
 
19
 
To enable this plugin, add a section to your location.conf
 
19
To enable this plugin, add a section to your locations.conf
20
20
like::
21
21
 
22
22
    [/home/user/proj]