Refactor to do diff per commit and only show conflicted changes in merges.
[git-central.git] / tests / .gitignore
1 /trash directory