aboutsummaryrefslogtreecommitdiff
path: root/t/t1000-read-tree-m-3way.sh
Commit message (Expand)AuthorAge
* Teach read-tree the -n|--dry-run optionJens Lehmann2011-05-25
* tests: add missing &&Jonathan Nieder2010-11-09
* tests: move convenience regexp to match object names to test-lib.shJunio C Hamano2010-01-03
* tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano2008-08-17
* tests: do not use implicit "git diff --no-index"Junio C Hamano2008-05-24
* t1000: use "test_must_fail git frotz", not "! git frotz"Junio C Hamano2008-03-16
* Sane use of test_expect_failureJunio C Hamano2008-02-01
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
* t1000: fix case table.Junio C Hamano2007-04-10
* Get rid of the dependency to GNU diff in the testsJohannes Schindelin2007-03-04
* Update the case table in t/t1000.Junio C Hamano2005-09-28
* [PATCH] Add debugging help for case #16 to read-tree.cJunio C Hamano2005-09-10
* Big tool rename.Junio C Hamano2005-09-07
* [PATCH] read-tree: loosen too strict index requirementsJunio C Hamano2005-06-12
* [PATCH] Finish making --emu23 equivalent to pure 2-way merge.Junio C Hamano2005-06-12
* [PATCH] read-tree: fix too strong index requirement #5ALTJunio C Hamano2005-06-12
* [PATCH] Add read-tree -m 3-way merge tests.Junio C Hamano2005-06-08
* [PATCH] Tests: read-tree -m test updates.Junio C Hamano2005-06-08
* [PATCH] 3-way merge tests for new "git-read-tree -m"?Junio C Hamano2005-06-05
* [PATCH] Make ls-* output consistent with diff-* output format.Junio C Hamano2005-05-26
* [PATCH] Add tests for diff-treeJunio C Hamano2005-05-20
* Fix up previous commitLinus Torvalds2005-05-19
* [PATCH] Add the merge test Linus called "test script from hell".Junio C Hamano2005-05-15