summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
AgeCommit message (Expand)AuthorFilesLines
2007-07-14Make every builtin-*.c file #include "builtin.h"Libravatar Peter Hagervall1-3/+4
2007-06-04git-merge-file: refuse to merge binary filesLibravatar Johannes Schindelin1-1/+5
2006-12-21move read_mmfile() into xdiff-interfaceLibravatar Johannes Schindelin1-18/+2
2006-12-06merge-file: support -p and -q; fix compile warningsLibravatar Johannes Schindelin1-9/+16
2006-12-06Add builtin merge-file, a minimal replacement for RCS mergeLibravatar Johannes Schindelin1-0/+72