Fix add_files_to_cache() to take pathspec, not user specified list of files
[gitweb.git] / builtin-merge-ours.c
2007-11-23 Merge branch 'maint'
2007-11-22 git-merge-ours: make it a builtin.