summaryrefslogtreecommitdiff
path: root/t/t6024-recursive-merge.sh
AgeCommit message (Expand)Author
2006-12-13merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin
2006-12-13add test case for recursive mergeJunio C Hamano