Refactor to do diff per commit and only show conflicted changes in merges.
[git-central.git] / tests / t5200-script-pull.sh
2008-08-19 Stephen Haberman'add' picks up all changes.
2008-08-19 Stephen HabermanTest for pull doing rebase.