Bazaar

  1. Bug #562669
  2. Comment #1

Comment 1 for bug 562669

Revision history for this message
Martin Pool (mbp) wrote : Re: provide base text in text conflicts

merge or remerge --show-base?

Perhaps this should be made more obvious in documentation or turned on by default when possible?