merge-recursive: Cleanup and consolidation of rename_conflict_info
[gitweb.git] / compat / hstrerror.c
2007-06-23 Merge branch 'ei/oneline+add-empty'
2007-06-23 Merge branch 'js/filter'
2007-06-22 Import branch 'git-p4' of git://repo.or.cz/fast-export
2007-06-16 Merge branch 'jc/remote'
2007-06-16 Merge branch 'gp/branch'
2007-06-16 Merge branch 'fl/cvsserver'
2007-06-16 Merge branch 'lh/submodule'
2007-06-16 Merge branch 'maint' to sync with GIT 1.5.2.2
2007-06-16 Add a local implementation of hstrerror for the system...