Viewing all changes in revision 3160.
- Committer: Canonical.com Patch Queue Manager
- Date: 2008-01-03 17:08:05 UTC
- mfrom: (3144.4.2 resolve-parent-kind)
- Revision ID: pqm@pqm.ubuntu.com-20080103170805-t22jan69n4n5kkub
Handle conflicts in parent file kind gracefully (abentley)
expand all
collapse all
added
removed
