Revert removal of multi-match discard heuristic in 27af01
[gitweb.git] / builtin / merge-ours.c
2010-03-10 Merge branch 'lt/deepen-builtin-source'
2010-02-22 Move 'builtin-*' into a 'builtin/' subdirectory