git-am: propagate --3way options as well
[gitweb.git] / builtin-merge-file.c
2006-12-06 Add builtin merge-file, a minimal replacement for RCS...