Remove redundant code, eliminate one static variable
[git] / builtin-merge-file.c
2006-12-06  Johannes Schindelinmerge-file: support -p and -q; fix compile warnings
2006-12-06  Johannes SchindelinAdd builtin merge-file, a minimal replacement for RCS...