index
:
git
master
git
Fast-forward packages
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
t
/
t6023-merge-file.sh
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
tests: do not use implicit "git diff --no-index"
Junio C Hamano
2008-05-24
1
-4
/
+4
*
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
Johannes Schindelin
2008-02-18
1
-0
/
+10
*
xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
Johannes Schindelin
2008-02-18
1
-0
/
+10
*
Sane use of test_expect_failure
Junio C Hamano
2008-02-02
1
-6
/
+6
*
Rewrite "git-frotz" to "git frotz"
Junio C Hamano
2007-07-03
1
-5
/
+5
*
Merge branch 'js/merge'
Junio C Hamano
2007-06-09
1
-0
/
+5
|
\
|
*
git-merge-file: refuse to merge binary files
Johannes Schindelin
2007-06-05
1
-0
/
+5
*
|
War on whitespace
Junio C Hamano
2007-06-07
1
-1
/
+0
|
/
*
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
-4
/
+4
*
Replace "echo -n" with printf in shell scripts.
Jason Riedy
2007-01-16
1
-1
/
+1
*
xdl_merge(): fix a segmentation fault when refining conflicts
Johannes Schindelin
2006-12-28
1
-0
/
+22
*
Add builtin merge-file, a minimal replacement for RCS merge
Johannes Schindelin
2006-12-06
1
-0
/
+116