~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5321.1.103.

  • Committer: Gordon Tyler
  • Date: 2010-12-07 00:54:32 UTC
  • mto: This revision was merged to the branch mainline in revision 5632.
  • Revision ID: gordon@doxxx.net-20101207005432-3n95ci8m0c72ru29
Renamed _find_merge_tool back to find_merge_tool since it must be public for UI code to lookup merge tools by name, and added tests for it.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: