Comment 5 for bug 562669
Revision history for this message
| Aaron Bentley (abentley) wrote Re: [Bug 562669] Re: provide base text in text conflicts | #5 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
bbfa235
(Get the code!)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 04/14/2010 12:03 PM, Jelmer Vernooij wrote:
> It would be nice to have a configuration option for this, indeed
> possibly defaulting to default. I can't think of a situation where I
> would *not* want this.
You might not want it because it is incompatible with --reprocess, and
you might want that instead.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAkv
wZsAn0iFjV4jJlL
=Z7gS
-----END PGP SIGNATURE-----