pull: support pull.ff config
[gitweb.git] / builtin / merge-ours.c
2010-02-22 Move 'builtin-*' into a 'builtin/' subdirectory