Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
builtin-merge-file.c
Age
Commit message (
Expand
)
Author
2010-05-02
git diff too slow for a file
René Scharfe
2010-01-21
Merge branch 'jc/conflict-marker-size'
Junio C Hamano
2010-01-17
xdl_merge(): introduce xmparam_t for merge specific parameters
Junio C Hamano
2009-11-30
git-merge-file --ours, --theirs
Junio C Hamano
2009-05-25
parse-opts: prepare for OPT_FILENAME
Stephen Boyd
2008-12-27
merge-file: handle freopen() failure
René Scharfe
2008-10-03
parse-opt: migrate builtin-merge-file.
Pierre Habouzit
2008-08-31
merge.conflictstyle: choose between "merge" and "diff3 -m" styles
Junio C Hamano
2008-08-31
xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
Junio C Hamano
2008-08-31
xdiff-merge: optionally show conflicts in "diff3 -m" style
Junio C Hamano
2008-03-14
Merge branch 'maint'
Junio C Hamano
2008-03-14
merge-file: handle empty files gracefully
Johannes Schindelin
2008-02-18
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
Johannes Schindelin
2007-07-15
Make every builtin-*.c file #include "builtin.h"
Peter Hagervall
2007-06-05
git-merge-file: refuse to merge binary files
Johannes Schindelin
2006-12-22
move read_mmfile() into xdiff-interface
Johannes Schindelin
2006-12-06
merge-file: support -p and -q; fix compile warnings
Johannes Schindelin
2006-12-06
Add builtin merge-file, a minimal replacement for RCS merge
Johannes Schindelin