Viewing all changes in revision 5118.
- Committer: Canonical.com Patch Queue Manager
- Date: 2011-01-14 23:04:35 UTC
- mfrom: (5110.2.7 660935-invalid-entry-name)
- 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
