pull: support rebased upstream + fetch + pull --rebase
[git] / t / t7605-merge-resolve.sh
2008-07-17  Junio C HamanoMerge branch 'maint'
2008-07-16  Junio C HamanoMerge branch 'mv/merge-in-c'
2008-07-13  Miklos VajnaAdd a new test for git-merge-resolve