Comment 3 for bug 562669
Revision history for this message
| Jelmer Vernooij (jelmer) wrote Re: [Bug 562669] Re: provide base text in text conflicts | #3 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
9199653
demo site
(Get the code!)
On Wed, 2010-04-14 at 00:37 +0000, Martin Pool wrote:
> merge or remerge --show-base?
>
> Perhaps this should be made more obvious in documentation or turned on
> by default when possible?
I was under the impression that this would just print the revision
number of the base revision. Obviously I was mistaken. :-)
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.
Cheers,
Jelmer