summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
AgeCommit message (Expand)AuthorFilesLines
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