aboutsummaryrefslogtreecommitdiff
path: root/t/t6024-recursive-merge.sh
Commit message (Expand)AuthorAge
* merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin2006-12-12
* add test case for recursive mergeJunio C Hamano2006-12-12