builtin/merge.c: fix a bug with trivial merges
[gitweb.git] / t / t7511-status-index.sh
2011-10-27 Merge branch 'rj/gitweb-clean-js'
2011-10-27 Merge branch 'js/grep-mutex'
2011-10-27 Merge branch 'maint'
2011-10-27 Merge branch 'rs/maint-estimate-cache-size' into maint
2011-10-26 read-cache.c: fix index memory allocation