index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t6024-recursive-merge.sh
Age
Commit message (
Expand
)
Author
Files
Lines
2019-11-07
t6024: modernize style
Elijah Newren
1
-63
/
+67
2018-08-29
commit-graph: define GIT_TEST_COMMIT_GRAPH
Derrick Stolee
1
-3
/
+3
2016-05-09
ll-merge: use a longer conflict marker for internal merge
Junio C Hamano
1
-1
/
+1
2010-11-09
tests: add missing &&
Jonathan Nieder
1
-1
/
+1
2009-07-01
Remove filename from conflict markers
Martin Renold
1
-5
/
+4
2008-12-24
merge-recursive: mark rename/delete conflict as unmerged
Johannes Schindelin
1
-0
/
+23
2008-07-13
t/: Use "test_must_fail git" instead of "! git"
Stephan Beyer
1
-2
/
+4
2008-05-24
tests: do not use implicit "git diff --no-index"
Junio C Hamano
1
-2
/
+2
2008-03-01
t6024: move "git reset" to prepare for a test inside the test itself
Junio C Hamano
1
-1
/
+1
2008-02-01
Sane use of test_expect_failure
Junio C Hamano
1
-1
/
+1
2007-07-02
Rewrite "git-frotz" to "git frotz"
Junio C Hamano
1
-4
/
+4
2007-06-04
merge-recursive: refuse to merge binary files
Johannes Schindelin
1
-0
/
+14
2007-04-16
Fix permissions on test scripts
Alex Riesen
1
-0
/
+0
2007-03-04
Get rid of the dependency to GNU diff in the tests
Johannes Schindelin
1
-2
/
+2
2006-12-28
t6024-recursive-merge: quiet down this test
Eric Wong
1
-43
/
+47
2006-12-23
Display 'theirs' branch name when possible in merge.
Shawn O. Pearce
1
-3
/
+3
2006-12-12
merge-recursive: add/add really is modify/modify with an empty base
Johannes Schindelin
1
-1
/
+11
2006-12-12
add test case for recursive merge
Junio C Hamano
1
-0
/
+70