aboutsummaryrefslogtreecommitdiffstats
path: root/t/t1000-read-tree-m-3way.sh
AgeCommit message (Expand)AuthorFilesLines
2021-10-12leak tests: mark some read-tree tests as passing with SANITIZE=leakÆvar Arnfjörð Bjarmason1-0/+2
2018-05-14t: switch $_x40 to $OID_REGEXbrian m. carlson1-1/+1
2017-01-11t1000: modernize styleStefan Beller1-333/+315
2014-04-29t1000-read-tree-m-3way.sh: use the $( ... ) construct for command substitutionElia Pinto1-2/+2
2011-05-25Teach read-tree the -n|--dry-run optionJens Lehmann1-40/+41
2010-11-09tests: add missing &&Jonathan Nieder1-1/+1
2010-01-03tests: move convenience regexp to match object names to test-lib.shJunio C Hamano1-3/+0
2008-08-17tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano1-1/+1
2008-05-24tests: do not use implicit "git diff --no-index"Junio C Hamano1-1/+1
2008-03-16t1000: use "test_must_fail git frotz", not "! git frotz"Junio C Hamano1-18/+18
2008-02-01Sane use of test_expect_failureJunio C Hamano1-72/+89
2007-07-02Rewrite "git-frotz" to "git frotz"Junio C Hamano1-86/+86
2007-04-10t1000: fix case table.Junio C Hamano1-1/+1
2007-03-04Get rid of the dependency to GNU diff in the testsJohannes Schindelin1-1/+1
2005-09-28Update the case table in t/t1000.Junio C Hamano1-31/+12
2005-09-10[PATCH] Add debugging help for case #16 to read-tree.cJunio C Hamano1-0/+16
2005-09-07Big tool rename.Junio C Hamano1-37/+37
2005-06-12[PATCH] read-tree: loosen too strict index requirementsJunio C Hamano1-0/+9
2005-06-12[PATCH] Finish making --emu23 equivalent to pure 2-way merge.Junio C Hamano1-12/+20
2005-06-12[PATCH] read-tree: fix too strong index requirement #5ALTJunio C Hamano1-8/+9
2005-06-08[PATCH] Add read-tree -m 3-way merge tests.Junio C Hamano1-12/+352
2005-06-08[PATCH] Tests: read-tree -m test updates.Junio C Hamano1-30/+28
2005-06-05[PATCH] 3-way merge tests for new "git-read-tree -m"?Junio C Hamano1-1/+18
2005-05-26[PATCH] Make ls-* output consistent with diff-* output format.Junio C Hamano1-49/+49
2005-05-20[PATCH] Add tests for diff-treeJunio C Hamano1-170/+1
2005-05-19Fix up previous commitLinus Torvalds1-0/+0
2005-05-15[PATCH] Add the merge test Linus called "test script from hell".Junio C Hamano1-0/+313
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-20 10:42:46 +0000