summaryrefslogtreecommitdiff
path: root/t/t7110-reset-merge.sh
AgeCommit message (Expand)Author
2010-01-04"reset --merge": fix unmerged caseJunio C Hamano
2010-01-03reset: use "unpack_trees()" directly instead of "git read-tree"Stephan Beyer
2009-12-30reset: add a few tests for "git reset --merge"Christian Couder