summaryrefslogtreecommitdiff
path: root/t/t1002-read-tree-m-u-2way.sh
AgeCommit message (Expand)AuthorFilesLines
2015-03-20t: use test_might_fail for diff and grepLibravatar Jeff King1-4/+4
2014-04-29t1002-read-tree-m-u-2way.sh: use the $( ... ) construct for command substitutionLibravatar Elia Pinto1-5/+5
2011-05-25Teach read-tree the -n|--dry-run optionLibravatar Jens Lehmann1-40/+41
2010-10-06t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&Libravatar Elijah Newren1-5/+5
2010-01-03tests: move convenience regexp to match object names to test-lib.shLibravatar Junio C Hamano1-2/+0
2008-08-18t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0'Libravatar Brandon Casey1-4/+6
2008-07-23t/: Replace diff [-u|-U0] with test_cmp to allow compilation with old diffLibravatar Brandon Casey1-6/+6
2008-05-24tests: do not use implicit "git diff --no-index"Libravatar Junio C Hamano1-1/+1
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-87/+87
2007-03-04Get rid of the dependency to GNU diff in the testsLibravatar Johannes Schindelin1-1/+1
2006-05-28t1002: use -U0 instead of --unified=0Libravatar Linus Torvalds1-10/+10
2006-05-17read-tree -m -u: do not overwrite or remove untracked working tree files.Libravatar Junio C Hamano1-23/+43
2006-04-22Libify diff-files.Libravatar Junio C Hamano1-1/+1
2005-09-07Big tool rename.Libravatar Junio C Hamano1-23/+23
2005-08-11[PATCH] Trapping exit in tests, using return for errorsLibravatar Pavel Roskin1-4/+4
2005-06-27[PATCH] replace sha1sum with sum in t/t1002Libravatar Mark Allen1-15/+32
2005-06-08[PATCH] Tests: read-tree -m test updates.Libravatar Junio C Hamano1-2/+2
2005-06-07[PATCH] read-tree: save more user hassles during fast-forward.Libravatar Junio C Hamano1-0/+307