100644 blob ca086db1e3182275f97e7b0bc6d9b8e89d3f6189	auto_merge_strategy.cc
100644 blob c68e24dc225f05dfdd8551e2525576658a06a03b	auto_merge_strategy.h
100644 blob fdb12e58434b27150d34d5451126332c51940a08	common_ancestor.cc
100644 blob b44eca86dd3eb8713fb0da6f5e5e1f8eb585486d	common_ancestor.h
100644 blob b15d2799e4f14f6110f6ea2deeec06cc354a1714	common_ancestor_unittest.cc
100644 blob 0c108306dadbb9808b559f5b9286349abe0f08ab	conflict_resolver_client.cc
100644 blob 82a3ad84a6e75cdd54e2635cf6dd3d481fbf0757	conflict_resolver_client.h
100644 blob 75bb25c2ca69b58151d2af0594fb318fb97cbe12	conflict_resolver_client_unittest.cc
100644 blob bdb54e21aede482474e71496bd36a9466b25cef5	custom_merge_strategy.cc
100644 blob fb92e4ea6f398976cfd551a2b36fe421ebfe8d69	custom_merge_strategy.h
100644 blob 149922dfb82980ce7b3e6f34ad237285f3c01c27	last_one_wins_merge_strategy.cc
100644 blob 905600eb5916c570d433dc1829c4f11a21e3b1fb	last_one_wins_merge_strategy.h
100644 blob 6ceed48db046b519ec6d2bd6747e74cc701e5237	ledger_merge_manager.cc
100644 blob dbddb45869a92f5296d6f501e7b93b06cd1de30e	ledger_merge_manager.h
100644 blob b8d0268b3ac066e1cf0319e9d678fa79c790ab69	merge_resolver.cc
100644 blob ac01c3c08f0d880148839069c1b3d7434c82f473	merge_resolver.h
100644 blob 2596ef672f72971f09fbe2cc01f07ea78d95f026	merge_resolver_unittest.cc
100644 blob 78a40697e5a8eae126531c6ad8f9bbb1e7413b76	merge_strategy.h
100644 blob ee8427d887bccd7db2fae7c3e549eda31fe27de3	test_utils.cc
100644 blob ea76078c392cab284b0c224d94c630bdf9610580	test_utils.h