summaryrefslogtreecommitdiff
path: root/t/t1000-read-tree-m-3way.sh
Commit message (Expand)AuthorAgeFilesLines
* t1000: use "test_must_fail git frotz", not "! git frotz"Junio C Hamano2008-03-161-18/+18
* Sane use of test_expect_failureJunio C Hamano2008-02-011-72/+89
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-86/+86
* t1000: fix case table.Junio C Hamano2007-04-101-1/+1
* Get rid of the dependency to GNU diff in the testsJohannes Schindelin2007-03-041-1/+1
* Update the case table in t/t1000.Junio C Hamano2005-09-281-31/+12
* [PATCH] Add debugging help for case #16 to read-tree.cJunio C Hamano2005-09-101-0/+16
* Big tool rename.Junio C Hamano2005-09-071-37/+37
* [PATCH] read-tree: loosen too strict index requirementsJunio C Hamano2005-06-121-0/+9
* [PATCH] Finish making --emu23 equivalent to pure 2-way merge.Junio C Hamano2005-06-121-12/+20
* [PATCH] read-tree: fix too strong index requirement #5ALTJunio C Hamano2005-06-121-8/+9
* [PATCH] Add read-tree -m 3-way merge tests.Junio C Hamano2005-06-081-12/+352
* [PATCH] Tests: read-tree -m test updates.Junio C Hamano2005-06-081-30/+28
* [PATCH] 3-way merge tests for new "git-read-tree -m"?Junio C Hamano2005-06-051-1/+18
* [PATCH] Make ls-* output consistent with diff-* output format.Junio C Hamano2005-05-261-49/+49
* [PATCH] Add tests for diff-treeJunio C Hamano2005-05-201-170/+1
* Fix up previous commitLinus Torvalds2005-05-191-0/+0
* [PATCH] Add the merge test Linus called "test script from hell".Junio C Hamano2005-05-151-0/+313
View Lorry Controller Status