~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5321.1.62.

  • Committer: Gordon Tyler
  • Date: 2010-11-06 03:12:20 UTC
  • mto: (5321.1.101 mergetools)
  • mto: This revision was merged to the branch mainline in revision 5632.
  • Revision ID: gordon@doxxx.net-20101106031220-mjfvda22hq6cdgud
Fixed doc for mergetools command for recent changes in how naming of merge tools is handled.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: