summaryrefslogtreecommitdiff
path: root/t/t6024-recursive-merge.sh
AgeCommit message (Expand)Author
2020-08-10Collect merge-related tests to t64xxElijah Newren
2020-02-07t6024: update for SHA-256brian m. carlson
2019-11-07t6024: modernize styleElijah Newren
2018-08-29commit-graph: define GIT_TEST_COMMIT_GRAPHDerrick Stolee
2016-05-09ll-merge: use a longer conflict marker for internal mergeJunio C Hamano
2010-11-09tests: add missing &&Jonathan Nieder
2009-07-02Remove filename from conflict markersMartin Renold
2008-12-25merge-recursive: mark rename/delete conflict as unmergedJohannes Schindelin
2008-07-13t/: Use "test_must_fail git" instead of "! git"Stephan Beyer
2008-05-24tests: do not use implicit "git diff --no-index"Junio C Hamano
2008-03-01t6024: move "git reset" to prepare for a test inside the test itselfJunio C Hamano
2008-02-02Sane use of test_expect_failureJunio C Hamano
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-06-05merge-recursive: 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
2006-12-28t6024-recursive-merge: quiet down this testEric Wong
2006-12-23Display 'theirs' branch name when possible in merge.Shawn O. Pearce
2006-12-13merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin
2006-12-13add test case for recursive mergeJunio C Hamano