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
/
merge-file.c
Age
Commit message (
Expand
)
Author
2011-04-11
sparse: Fix an "symbol 'merge_file' not decared" warning
Ramsay Jones
2010-08-26
ll-merge: replace flag argument with options struct
Jonathan Nieder
2010-06-13
Merge branch 'rs/diff-no-minimal'
Junio C Hamano
2010-05-02
git diff too slow for a file
René Scharfe
2010-03-21
merge_file(): add comment explaining behavior wrt conflict style
Jonathan Nieder
2010-03-21
ll_merge(): add ancestor label parameter for diff3-style output
Jonathan Nieder
2010-01-17
merge-tree: use ll_merge() not xdl_merge()
Junio C Hamano
2010-01-17
xdl_merge(): introduce xmparam_t for merge specific parameters
Junio C Hamano
2008-10-25
Always initialize xpparam_t to 0
Brian Downing
2007-12-14
xdl_diff: identify call sites.
Junio C Hamano
2007-07-06
Future-proof source for changes in xdemitconf_t
Johannes Schindelin
2007-02-27
convert object type handling from a string to a number
Nicolas Pitre
2006-12-13
Get rid of the dependency on RCS' merge program
Johannes Schindelin
2006-09-02
Replace uses of strdup with xstrdup.
Shawn Pearce
2006-06-29
Improved three-way blob merging code
Linus Torvalds