Martin von Zweigbergk 2a531832d6 rewrite: make merge_commit_trees() use index for finding common ancestors ... The index is now always kept up to date and it has functionality for finding common ancestors, so let's use it! This should make merging commits a little faster if their common ancestor is far away (which is rare). It's probably much more important that the index-based algorithm is more correct. Also, it returns multiple common ancestors in the criss-cross case, which lets us do a recursive merge like git does. I'm leaving the recursive merge for later, though.		2021-02-23 20:49:18 -08:00
..
protos
src	rewrite: make merge_commit_trees() use index for finding common ancestors	2021-02-23 20:49:18 -08:00
tests
build.rs
Cargo.toml