summaryrefslogtreecommitdiff
path: root/t/t1000-read-tree-m-3way.sh
AgeCommit message (Expand)AuthorFilesLines
2007-04-10t1000: fix case table.Libravatar Junio C Hamano1-1/+1
2007-03-04Get rid of the dependency to GNU diff in the testsLibravatar Johannes Schindelin1-1/+1
2005-09-28Update the case table in t/t1000.Libravatar Junio C Hamano1-31/+12
2005-09-10[PATCH] Add debugging help for case #16 to read-tree.cLibravatar Junio C Hamano1-0/+16
2005-09-07Big tool rename.Libravatar Junio C Hamano1-37/+37
2005-06-12[PATCH] read-tree: loosen too strict index requirementsLibravatar Junio C Hamano1-0/+9
2005-06-12[PATCH] Finish making --emu23 equivalent to pure 2-way merge.Libravatar Junio C Hamano1-12/+20
2005-06-12[PATCH] read-tree: fix too strong index requirement #5ALTLibravatar Junio C Hamano1-8/+9
2005-06-08[PATCH] Add read-tree -m 3-way merge tests.Libravatar Junio C Hamano1-12/+352
2005-06-08[PATCH] Tests: read-tree -m test updates.Libravatar Junio C Hamano1-30/+28
2005-06-05[PATCH] 3-way merge tests for new "git-read-tree -m"?Libravatar Junio C Hamano1-1/+18
2005-05-26[PATCH] Make ls-* output consistent with diff-* output format.Libravatar Junio C Hamano1-49/+49
2005-05-20[PATCH] Add tests for diff-treeLibravatar Junio C Hamano1-170/+1
2005-05-19Fix up previous commitLibravatar Linus Torvalds1-0/+0
2005-05-15[PATCH] Add the merge test Linus called "test script from hell".Libravatar Junio C Hamano1-0/+313