~barry/bzr-builddeb/609186-urls

Viewing all changes in revision 479.

  • Committer: James Westby
  • Date: 2010-09-10 02:44:29 UTC
  • mfrom: (459.2.2 trunk)
  • Revision ID: james.westby@canonical.com-20100910024429-hawn12esnsxfb3sk
Fix the auto-detection of merge mode. Thanks Jelmer.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: