summaryrefslogtreecommitdiff
path: root/t/t6024-recursive-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2016-05-09ll-merge: use a longer conflict marker for internal mergeLibravatar Junio C Hamano1-1/+1
2010-11-09tests: add missing &&Libravatar Jonathan Nieder1-1/+1
2009-07-01Remove filename from conflict markersLibravatar Martin Renold1-5/+4
2008-12-24merge-recursive: mark rename/delete conflict as unmergedLibravatar Johannes Schindelin1-0/+23
2008-07-13t/: Use "test_must_fail git" instead of "! git"Libravatar Stephan Beyer1-2/+4
2008-05-24tests: do not use implicit "git diff --no-index"Libravatar Junio C Hamano1-2/+2
2008-03-01t6024: move "git reset" to prepare for a test inside the test itselfLibravatar Junio C Hamano1-1/+1
2008-02-01Sane use of test_expect_failureLibravatar Junio C Hamano1-1/+1
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-4/+4
2007-06-04merge-recursive: refuse to merge binary filesLibravatar Johannes Schindelin1-0/+14
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-2/+2
2006-12-28t6024-recursive-merge: quiet down this testLibravatar Eric Wong1-43/+47
2006-12-23Display 'theirs' branch name when possible in merge.Libravatar Shawn O. Pearce1-3/+3
2006-12-12merge-recursive: add/add really is modify/modify with an empty baseLibravatar Johannes Schindelin1-1/+11
2006-12-12add test case for recursive mergeLibravatar Junio C Hamano1-0/+70
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 22:29:04 +0000