-
Committer:
Bazaar Package Importer
-
Author(s):
Christoph Berg
-
Date:
2010-09-22 21:41:30 UTC
-
mfrom:
(6.1.1 sid)
-
Revision ID:
james.westby@ubuntu.com-20100922214130-km3c90dj24s5oyw3
Tags: 2.6-3
Enable -m short option for --merge as documented in help and manpage.
Closes: #597305.