summaryrefslogtreecommitdiff
path: root/t/t1000-read-tree-m-3way.sh
AgeCommit message (Expand)Author
2017-01-11t1000: modernize styleStefan Beller
2014-04-29t1000-read-tree-m-3way.sh: use the $( ... ) construct for command substitutionElia Pinto
2011-05-25Teach read-tree the -n|--dry-run optionJens Lehmann
2010-11-09tests: add missing &&Jonathan Nieder
2010-01-04tests: move convenience regexp to match object names to test-lib.shJunio C Hamano
2008-08-17tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano
2008-05-24tests: do not use implicit "git diff --no-index"Junio C Hamano
2008-03-16t1000: use "test_must_fail git frotz", not "! git frotz"Junio C Hamano
2008-02-02Sane use of test_expect_failureJunio C Hamano
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-04-10t1000: fix case table.Junio C Hamano
2007-03-04Get rid of the dependency to GNU diff in the testsJohannes Schindelin
2005-09-28Update the case table in t/t1000.Junio C Hamano
2005-09-11[PATCH] Add debugging help for case #16 to read-tree.cJunio C Hamano
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