summaryrefslogtreecommitdiff
path: root/t/t6021-merge-criss-cross.sh
AgeCommit message (Expand)Author
2006-10-27tests: merge-recursive is usable without PythonJunio C Hamano
2006-07-10Fix more typos, primarily in the codePavel Roskin
2006-02-19Optionally work without pythonJohannes Schindelin
2005-12-03New test case: Criss-cross mergeFredrik Kuivinen