summaryrefslogtreecommitdiff
path: root/t/t6024-recursive-merge.sh
Commit message (Expand)AuthorAgeFilesLines
* tests: add missing &&Jonathan Nieder2010-11-091-1/+1
* Remove filename from conflict markersMartin Renold2009-07-011-5/+4
* merge-recursive: mark rename/delete conflict as unmergedJohannes Schindelin2008-12-241-0/+23
* t/: Use "test_must_fail git" instead of "! git"Stephan Beyer2008-07-131-2/+4
* tests: do not use implicit "git diff --no-index"Junio C Hamano2008-05-241-2/+2
* t6024: move "git reset" to prepare for a test inside the test itselfJunio C Hamano2008-03-011-1/+1
* Sane use of test_expect_failureJunio C Hamano2008-02-011-1/+1
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-4/+4
* merge-recursive: refuse to merge binary filesJohannes Schindelin2007-06-041-0/+14
* Fix permissions on test scriptsAlex Riesen2007-04-161-0/+0
* Get rid of the dependency to GNU diff in the testsJohannes Schindelin2007-03-041-2/+2
* t6024-recursive-merge: quiet down this testEric Wong2006-12-281-43/+47
* Display 'theirs' branch name when possible in merge.Shawn O. Pearce2006-12-231-3/+3
* merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin2006-12-121-1/+11
* add test case for recursive mergeJunio C Hamano2006-12-121-0/+70