~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 6015.35.1.

  • Committer: Gordon Tyler
  • Date: 2011-09-09 12:42:32 UTC
  • mto: (6015.33.4 2.4)
  • mto: This revision was merged to the branch mainline in revision 6134.
  • Revision ID: gordon@doxxx.net-20110909124232-ip0bgx4tx6y5fya6
Use get_user_option in get_merge_tools so that quoted values are correctly unquoted.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: