Code

History

Commits on ig/commit-debug to lib/src/tree_merge.rs4
  1. merge: remove Default from MergeOptionsYuya Nishihara committed 1 year ago8cd43d1
  2. tree: move try_resolve_file_conflict() to tree_merge()Martin von Zweigbergk committed 1 year agoc12ee12
  3. merged_tree: move MergeOptions to tree_mergeMartin von Zweigbergk committed 1 year ago92bc6e4
  4. merged_tree: extract `merge_tree()` to new moduleMartin von Zweigbergk committed 1 year ago5d93019