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
/
t
/
t6023-merge-file.sh
Age
Commit message (
Expand
)
Author
2006-12-28
xdl_merge(): fix a segmentation fault when refining conflicts
Johannes Schindelin
2006-12-06
Add builtin merge-file, a minimal replacement for RCS merge
Johannes Schindelin