100644 blob 071d5d2c48ce47776307728772d8b56c5fde135c	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 e38690d2c44030d36b5065df57ed5616642a7191	conflict_resolver_client.cc
100644 blob b576866d4743daba4a085f8fd043843c27e89df3	conflict_resolver_client.h
100644 blob 4924571fb2e8bf586c0ebab1a47576ba3d1af163	conflict_resolver_client_unittest.cc
100644 blob 69c587f0ecf14e06aadebc6862d93e851f169c10	custom_merge_strategy.cc
100644 blob fb92e4ea6f398976cfd551a2b36fe421ebfe8d69	custom_merge_strategy.h
100644 blob da56323950333014dbefff357fbf4f81d3ebb9b0	last_one_wins_merge_strategy.cc
100644 blob 905600eb5916c570d433dc1829c4f11a21e3b1fb	last_one_wins_merge_strategy.h
100644 blob 32fc88e833925fe55091b5c660a3594a049dd1db	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 a3ff9fa882a60d658cb45a3cad783a576523f9d6	merge_resolver_unittest.cc
100644 blob 78a40697e5a8eae126531c6ad8f9bbb1e7413b76	merge_strategy.h
100644 blob c82dbd3bafc94bfd4319cbc5dabcf623c83c1225	test_utils.cc
100644 blob ea76078c392cab284b0c224d94c630bdf9610580	test_utils.h