~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5321.2.4.

  • Committer: Vincent Ladeuil
  • Date: 2010-12-06 10:33:58 UTC
  • mto: (5321.1.101 mergetools)
  • mto: This revision was merged to the branch mainline in revision 5632.
  • Revision ID: v.ladeuil+lp@free.fr-20101206103358-o4rr2spy1ggkhwa8
Simplify MergeTool by making the name mandatory and keeping the command line intact.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: