aboutsummaryrefslogtreecommitdiff
path: root/t/t6024-recursive-merge.sh
Commit message (Expand)AuthorAge
* ll-merge: use a longer conflict marker for internal mergeJunio C Hamano2016-05-09
* tests: add missing &&Jonathan Nieder2010-11-09
* Remove filename from conflict markersMartin Renold2009-07-01
* merge-recursive: mark rename/delete conflict as unmergedJohannes Schindelin2008-12-24
* t/: Use "test_must_fail git" instead of "! git"Stephan Beyer2008-07-13
* tests: do not use implicit "git diff --no-index"Junio C Hamano2008-05-24
* t6024: move "git reset" to prepare for a test inside the test itselfJunio C Hamano2008-03-01
* Sane use of test_expect_failureJunio C Hamano2008-02-01
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
* merge-recursive: refuse to merge binary filesJohannes Schindelin2007-06-04
* Fix permissions on test scriptsAlex Riesen2007-04-16
* Get rid of the dependency to GNU diff in the testsJohannes Schindelin2007-03-04
* t6024-recursive-merge: quiet down this testEric Wong2006-12-28
* Display 'theirs' branch name when possible in merge.Shawn O. Pearce2006-12-23
* merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin2006-12-12
* add test case for recursive mergeJunio C Hamano2006-12-12
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-18 12:23:44 +0000