summaryrefslogtreecommitdiff
path: root/t/t1000-read-tree-m-3way.sh
AgeCommit message (Expand)Author
2005-09-08Big tool rename.Junio C Hamano
2005-06-13[PATCH] read-tree: loosen too strict index requirementsJunio C Hamano
2005-06-13[PATCH] Finish making --emu23 equivalent to pure 2-way merge.Junio C Hamano
2005-06-13[PATCH] read-tree: fix too strong index requirement #5ALTJunio C Hamano
2005-06-08[PATCH] Add read-tree -m 3-way merge tests.Junio C Hamano
2005-06-08[PATCH] Tests: read-tree -m test updates.Junio C Hamano
2005-06-06[PATCH] 3-way merge tests for new "git-read-tree -m"?Junio C Hamano
2005-05-26[PATCH] Make ls-* output consistent with diff-* output format.Junio C Hamano
2005-05-20[PATCH] Add tests for diff-treeJunio C Hamano
2005-05-20Fix up previous commitLinus Torvalds
2005-05-14[PATCH] Add the merge test Linus called "test script from hell".Junio C Hamano