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
/
xdiff
/
xmerge.c
Age
Commit message (
Expand
)
Author
2017-11-09
Replace Free Software Foundation address in license notices
Todd Zullinger
2016-02-27
Merge branch 'ps/plug-xdl-merge-leak'
Junio C Hamano
2016-02-23
xdiff/xmerge: fix memory leak in xdl_merge
Patrick Steinhardt
2016-01-27
merge-file: ensure that conflict sections match eol style
Johannes Schindelin
2016-01-27
merge-file: let conflict markers match end-of-line style of the context
Johannes Schindelin
2014-07-01
git-merge-file: do not add LF at EOF while applying unrelated change
Max Kirillov
2010-10-06
xdiff: cast arguments for ctype functions to unsigned char
Jonathan Nieder
2010-05-01
xdiff/xmerge.c: use memset() instead of explicit for-loop
Alexey Mahotkin
2010-03-21
xdl_merge(): move file1 and file2 labels to xmparam structure
Jonathan Nieder
2010-03-21
xdl_merge(): add optional ancestor label to diff3-style output
Jonathan Nieder
2010-03-02
refactor merge flags into xmparam_t
Bert Wesarg
2010-03-02
make union merge an xdl merge favor
Bert Wesarg
2010-01-21
Merge branch 'jc/conflict-marker-size'
Junio C Hamano
2010-01-17
xdl_merge(): allow passing down marker_size in xmparam_t
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-06-02
Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
Junio C Hamano
2009-05-25
Change xdl_merge to generate output even for null merges
Charles Bailey
2008-08-31
xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
Junio C Hamano
2008-08-31
xmerge.c: minimum readability fixups
Junio C Hamano
2008-08-31
xdiff-merge: optionally show conflicts in "diff3 -m" style
Junio C Hamano
2008-08-31
xdl_fill_merge_buffer(): separate out a too deeply nested function
Junio C Hamano
2008-02-18
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
Johannes Schindelin
2008-02-18
xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
Johannes Schindelin
2006-12-31
Fix yet another subtle xdl_merge() bug
Johannes Schindelin
2006-12-29
xdl_merge(): fix a segmentation fault when refining conflicts
Johannes Schindelin
2006-12-06
xdl_merge(): fix and simplify conflict handling
Johannes Schindelin
2006-12-03
xdl_merge(): fix thinko
Johannes Schindelin
2006-12-03
xdl_merge(): fix an off-by-one bug
Johannes Schindelin
2006-12-03
xmerge: make return value from xdl_merge() more usable.
Junio C Hamano
2006-12-03
xdiff: add xdl_merge()
Johannes Schindelin