index
:
git
main
maint
master
next
seen
todo
Git: sistema de control de versiones
mirror
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
xdiff
/
xmerge.c
Age
Commit message (
Expand
)
Author
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-28
xdl_merge(): fix a segmentation fault when refining conflicts
Johannes Schindelin
2006-12-05
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