Viewing all changes in revision 6015.44.4.
- Committer: Patch Queue Manager
- Date: 2011-10-27 15:29:57 UTC
- mfrom: (6015.47.9 880701-resolve-duplicate)
- mto: (6234.1.1 trunk) (6015.57.1 2.4) (6256.1.1 dev_2.4_integration) (6344.1.1 dev_2.4_integration) (6437.2.1 2.5b5-dev)
- mto: This revision was merged to the branch mainline in revision 6236.
- Revision ID: pqm@pqm.ubuntu.com-20111027152957-gfc64dky77azio9v
(vila) Generate a 'duplicate' conflict instead of a 'content' conflict when
the same path is involved in both branches. (Vincent Ladeuil)
the same path is involved in both branches. (Vincent Ladeuil)
expand all
collapse all
added
removed
