Switched to patience diff for git