summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
AgeCommit message (Expand)Author
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin
2008-02-18xdl_merge(): make XDL_MERGE_ZEALOUS output simplerJohannes Schindelin
2008-02-02Sane use of test_expect_failureJunio C Hamano
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-06-09Merge branch 'js/merge'Junio C Hamano
2007-06-07War on whitespaceJunio C Hamano
2007-06-05git-merge-file: refuse to merge binary filesJohannes Schindelin
2007-04-16Fix permissions on test scriptsAlex Riesen
2007-03-04Get rid of the dependency to GNU diff in the testsJohannes Schindelin
2007-01-16Replace "echo -n" with printf in shell scripts.Jason Riedy
2006-12-28xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin
2006-12-06Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin