summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
AgeCommit message (Expand)AuthorFilesLines
2008-09-08t6023-merge-file: Work around non-portable sed usageLibravatar Arjen Laarhoven1-2/+2
2008-08-17tests: use $TEST_DIRECTORY to refer to the t/ directoryLibravatar Junio C Hamano1-1/+1
2008-07-13t/: Use "test_must_fail git" instead of "! git"Libravatar Stephan Beyer1-6/+8
2008-05-24tests: do not use implicit "git diff --no-index"Libravatar Junio C Hamano1-4/+4
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMLibravatar Johannes Schindelin1-0/+10
2008-02-18xdl_merge(): make XDL_MERGE_ZEALOUS output simplerLibravatar Johannes Schindelin1-0/+10
2008-02-01Sane use of test_expect_failureLibravatar Junio C Hamano1-6/+6
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-5/+5
2007-06-09Merge branch 'js/merge'Libravatar Junio C Hamano1-0/+5
2007-06-07War on whitespaceLibravatar Junio C Hamano1-1/+0
2007-06-04git-merge-file: refuse to merge binary filesLibravatar Johannes Schindelin1-0/+5
2007-04-16Fix permissions on test scriptsLibravatar Alex Riesen1-0/+0
2007-03-04Get rid of the dependency to GNU diff in the testsLibravatar Johannes Schindelin1-4/+4
2007-01-15Replace "echo -n" with printf in shell scripts.Libravatar Jason Riedy1-1/+1
2006-12-28xdl_merge(): fix a segmentation fault when refining conflictsLibravatar Johannes Schindelin1-0/+22
2006-12-06Add builtin merge-file, a minimal replacement for RCS mergeLibravatar Johannes Schindelin1-0/+116
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 23:39:13 +0000