~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5321.1.110.

  • Committer: Gordon Tyler
  • Date: 2011-01-15 18:14:46 UTC
  • mto: This revision was merged to the branch mainline in revision 5632.
  • Revision ID: gordon@doxxx.net-20110115181446-8aylrt2jznr1tbj8
Changed get_default_merge_tool to return the name, to be consistent with set_default_merge_tool.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: