Refactor to do diff per commit and only show conflicted changes in merges.
[git-central.git] / tests / t2300-server-update-prefer-rebase.sh
2008-06-24 Stephen HabermanConvert prefer-rebase to update.