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