summaryrefslogtreecommitdiffstats
path: root/sync/engine/conflict_util.h
Commit message (Expand)AuthorAgeFilesLines
* sync: wrap conflict_utils in a namespacetim@chromium.org2012-10-251-0/+3
* sync: Don't use ConflictProgress in the resolverrlarocque@chromium.org2012-10-021-2/+2
* sync: Introduce control data typesrlarocque@chromium.org2012-08-311-0/+31