On Thu, 2008-06-19 at 23:27 +1000, Jack Andrews wrote:
> is it solved in the case i have the base source as well as the patches?

Certainly 'git rebase -i' seems to manage it quite well for git
repositories.  It is more sophisticated in that it allows several
different types of 'merge driver' to help with merge conflicts.

Tim.
*/