path: root/t/
AgeCommit message (Expand)Author
2020-08-10Collect merge-related tests to t64xxElijah Newren
2020-02-27t602[1236], t6034: modernize test formattingElijah Newren
2019-12-04doc: replace MARC links with lore.kernel.orgDenton Liu
2015-04-29merge: deprecate 'git merge <message> HEAD <commit>' syntaxJunio C Hamano
2013-07-22update URL to the mail archiveOndřej Bílka
2008-07-13t6021: add a new test for git-merge-resolveMiklos Vajna
2007-06-07War on whitespaceJunio C Hamano
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