Viewing all changes in revision 152.
- Committer: Samuele Pedroni (Canonical Services Ltd.)
- Date: 2011-12-16 09:34:04 UTC
- mfrom: (145.3.5 propagate-resolution)
- Revision ID: samuele.pedroni@canonical.com-20111216093404-tdi5zhdduv8gm4j4
put_doc_if_newere and force_doc_conflict should supersede conflicts as appropriate; fixes #900313
expand all
collapse all
added
removed
