/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to apport/bzr-crashdb.conf

  • Committer: John Arbash Meinel
  • Date: 2008-03-04 14:25:46 UTC
  • mto: This revision was merged to the branch mainline in revision 3279.
  • Revision ID: john@arbash-meinel.com-20080304142546-zuwwy0o9roo14928
Implement cherrypick support for Merge3
When merging a cherrypick, use a slightly different resolve logic.
When encountering a conflict, the new logic does not include lines that
were present in BASE that are conflicting with OTHER.
This is done since a cherrypick is (by definition) avoiding changes that
are present in the base.
(related to bug #151731)

Show diffs side-by-side

added added

removed removed

Lines of Context:
apport/bzr-crashdb.conf
1
 
bzr = {
2
 
        # most bzr bugs are upstream bugs; file them there
3
 
        'impl': 'launchpad',
4
 
        'project': 'bzr',
5
 
        'bug_pattern_base': 'http://people.canonical.com/~pitti/bugpatterns',
6
 
}