← Back to branch summary

~jamesodhunt/ubuntu/trusty/patch/bug-1306412

Viewing all changes in revision 7.

  • Committer: Bazaar Package Importer
  • Author(s): Christoph Berg
  • Date: 2010-09-22 21:41:30 UTC
  • Revision ID: james.westby@ubuntu.com-20100922214130-6tdtku79v5nlgu76
Tags: 2.6-3
http://bugs.debian.org/597305
Enable -m short option for --merge as documented in help and manpage.
Closes: #597305.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: