[MERGE] add -c option to merge command (#141368)

[Alexander Belchenko]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Actually adding -c option was quite trivial, but as usual test for changes
is much bigger than actual changes.

[µ]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFG9RpizYr338mxwCURApoDAJ9b9NHczAPih3ZrOZ7JoNeEB8pZ1wCfR4MR
DAGf2MMWOhZ4gSTz7oIR/7k=
=3a+f
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: bzr-mail-_bpdlg.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20070922/2f6b868e/attachment.diff