Git: How do I merge complex branches that have widely diverged with some missing history?
I have two "branches", both of which started from the same code base, but both of which were imported to git after they diverged.  The prior history is lost, and additionally both branches have extensive changes recorded in their git history.

What is a good strategy to approach merging features and bugfixes between these two branches in a manageable way?

Is there a tool that will assist me in separating differences in the original imports into meaningful commits?
Git: How do I merge complex branches that have widely diverged with some missing history?
===

I have two "branches", both of which started from the same code base, but both of which were imported to git after they diverged.  The prior history is lost, and additionally both branches have extensive changes recorded in their git history.

What is a good strategy to approach merging features and bugfixes between these two branches in a manageable way?

Is there a tool that will assist me in separating differences in the original imports into meaningful commits?