- Committer: Canonical.com Patch Queue Manager
- Date: 2010-12-03 08:31:44 UTC
- mfrom: (4597.14.11 638451-malformed)
- Revision ID: pqm@pqm.ubuntu.com-20101203083144-b2qfwgifwp1wq6zv
(vila) Implement resolve --take-this and --take-other for text conflicts.
(Vincent Ladeuil)
(Vincent Ladeuil)
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||