Viewing all changes in revision 5050.62.2.
- Committer: Canonical.com Patch Queue Manager
- Date: 2011-01-14 23:04:35 UTC
- mfrom: (5050.63.7 660935-invalid-entry-name)
- mto: (5609.6.1 2.3.0-dev) (5050.71.1 2.2) (6024.3.1 integration) (6012.1.1 trunk) (4797.94.3 2.2-feature-flags)
- mto: This revision was merged to the branch mainline in revision 5615.
- Revision ID: pqm@pqm.ubuntu.com-20110114230435-ww0f1p7y9rgdr7nn
(vila) Correctly resolve --take-this/--take-other for path/content conflicts
in subdirs. (Vincent Ladeuil)
in subdirs. (Vincent Ladeuil)
- files modified:
- NEWS
expand all
collapse all
added
removed
