Commit 443d5674fe3f2edd4cb51c7657e7ad5063275bff

Edward Thomson 2014-07-17T11:59:01

git_rebase_next: write conflicts nicely during rebase