aboutsummaryrefslogtreecommitdiff
path: root/t/t6021-merge-criss-cross.sh
Commit message (Expand)AuthorAge
* t6021: add a new test for git-merge-resolveMiklos Vajna2008-07-13
* War on whitespaceJunio C Hamano2007-06-07
* tests: merge-recursive is usable without PythonJunio C Hamano2006-10-27
* Fix more typos, primarily in the codePavel Roskin2006-07-10
* Optionally work without pythonJohannes Schindelin2006-02-18
* New test case: Criss-cross mergeFredrik Kuivinen2005-12-03