Git Merge Diff Algorithm