summaryrefslogtreecommitdiff
path: root/t/t6021-merge-criss-cross.sh
AgeCommit message (Expand)AuthorFilesLines
2013-07-22update URL to the marc.info mail archiveLibravatar Ondřej Bílka1-1/+1
2008-07-13t6021: add a new test for git-merge-resolveLibravatar Miklos Vajna1-0/+4
2007-06-07War on whitespaceLibravatar Junio C Hamano1-1/+1
2006-10-27tests: merge-recursive is usable without PythonLibravatar Junio C Hamano1-6/+0
2006-07-10Fix more typos, primarily in the codeLibravatar Pavel Roskin1-1/+1
2006-02-18Optionally work without pythonLibravatar Johannes Schindelin1-0/+6
2005-12-03New test case: Criss-cross mergeLibravatar Fredrik Kuivinen1-0/+92