summaryrefslogtreecommitdiff
path: root/t/t6024-recursive-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2006-12-28t6024-recursive-merge: quiet down this testLibravatar Eric Wong1-43/+47
2006-12-23Display 'theirs' branch name when possible in merge.Libravatar Shawn O. Pearce1-3/+3
2006-12-12merge-recursive: add/add really is modify/modify with an empty baseLibravatar Johannes Schindelin1-1/+11
2006-12-12add test case for recursive mergeLibravatar Junio C Hamano1-0/+70