summaryrefslogtreecommitdiff
path: root/t/t6021-merge-criss-cross.sh
Commit message (Expand)AuthorAgeFilesLines
* merge: deprecate 'git merge <message> HEAD <commit>' syntaxjc/mergeJunio C Hamano2015-04-291-3/+3
* update URL to the marc.info mail archiveOndřej Bílka2013-07-221-1/+1
* t6021: add a new test for git-merge-resolveMiklos Vajna2008-07-131-0/+4
* War on whitespaceJunio C Hamano2007-06-071-1/+1
* tests: merge-recursive is usable without PythonJunio C Hamano2006-10-271-6/+0
* Fix more typos, primarily in the codePavel Roskin2006-07-101-1/+1
* Optionally work without pythonJohannes Schindelin2006-02-181-0/+6
* New test case: Criss-cross mergeFredrik Kuivinen2005-12-031-0/+92