100644 blob c20bb2084285a529df08b18eaf9db4a5a1bf8e7d	auto_merge_strategy.cc
100644 blob df9c28dcc16e80d0ab7f9386cb16631bbc3c787a	auto_merge_strategy.h
100644 blob d1f117ad3d3c27c183b8ff0164ebeb8a80e5b4d0	common_ancestor.cc
100644 blob 6447aa541d0a3877bea8b920e670d6761bb6a77d	common_ancestor.h
100644 blob 6bf168cd8119c6740ce8bf03d6999e826f5931e8	common_ancestor_unittest.cc
100644 blob 50882fe43360a260aab57a44d90ad67999c2f33f	conflict_resolver_client.cc
100644 blob 19f62537b867ae9d3e03781f193bdfc2ae6052d8	conflict_resolver_client.h
100644 blob 6d8cbee504fa947b30b88a898b74260e2ce32275	conflict_resolver_client_unittest.cc
100644 blob 9e0bed4d8ff50e65383faf465eaeaeaf7d4f0113	custom_merge_strategy.cc
100644 blob caedfe18752f6ba04854c4afaa7e4ede46950feb	custom_merge_strategy.h
100644 blob 16a316a511df89dac1d1a0a99127a6937408b9f9	last_one_wins_merge_strategy.cc
100644 blob a7ac07cf487a292ad15e9fc468723622c3d34832	last_one_wins_merge_strategy.h
100644 blob 997f0047b5c72cb5ce9e56d5247249d1563965e8	ledger_merge_manager.cc
100644 blob 7b81280d9631e4dcf801ac4a908e801493ee73be	ledger_merge_manager.h
100644 blob 617ddc69dc91b77d5bb45f601efe650f5365bd9a	merge_resolver.cc
100644 blob 6d1252e37a1471d5bf2d7af07c4b5e91ab553f39	merge_resolver.h
100644 blob c24af20c6ff8eb7fb5c13b8134ae26dc9eb45c58	merge_resolver_unittest.cc
100644 blob 172bc0bbae20d2989c8f5d19b45ddff1278e7787	merge_strategy.h
100644 blob bd71c8caf0173ca9923d6afaabc11c7bde8ef204	test_utils.cc
100644 blob 78116ed283e455b1d2da58ac4da3df2ce3d5603b	test_utils.h