Google Git
Sign in
fuchsia / fuchsia / dd04239d5d9374032e1358fc204f405bf21e0025 / . / src / ledger / bin / app / merging
tree: 3a84aabd093ed10e10ff825a888e30141c4892f4 [path history] [tgz]
  1. auto_merge_strategy.cc
  2. auto_merge_strategy.h
  3. common_ancestor.cc
  4. common_ancestor.h
  5. common_ancestor_unittest.cc
  6. conflict_resolver_client.cc
  7. conflict_resolver_client.h
  8. conflict_resolver_client_unittest.cc
  9. custom_merge_strategy.cc
  10. custom_merge_strategy.h
  11. last_one_wins_merge_strategy.cc
  12. last_one_wins_merge_strategy.h
  13. ledger_merge_manager.cc
  14. ledger_merge_manager.h
  15. merge_resolver.cc
  16. merge_resolver.h
  17. merge_resolver_unittest.cc
  18. merge_strategy.h
  19. test_utils.cc
  20. test_utils.h