merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t4132-apply-removal.sh
2009-08-22 Merge branch 'gb/apply-ignore-whitespace'
2009-08-22 Merge branch 'bc/mailsplit-cr-at-eol'
2009-08-19 Merge branch 'rc/maint-http-fix'
2009-08-19 Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
2009-08-18 Merge branch 'maint'
2009-08-16 Merge branch 'bc/maint-am-email'
2009-08-16 Merge branch 'js/maint-cover-letter-non-ascii'
2009-08-16 Merge branch 'jc/maint-clean-nested-dir-safety'
2009-08-16 Merge branch 'jk/maint-merge-msg-fix'
2009-08-16 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-14 Merge branch 'jn/gitweb-blame' (early part)
2009-08-12 Merge branch 'maint'
2009-08-11 Merge branch 'maint'
2009-08-11 Merge branch 'jc/maint-merge-recursive-fix'
2009-08-11 Merge branch 'zf/maint-gitweb-acname'
2009-08-11 Merge branch 'np/maint-limit-delta-cache'
2009-08-11 Merge branch 'jp/symlink-dirs'
2009-08-11 Merge branch 'mk/grep-max-depth'
2009-08-11 Merge branch 'js/run-command-updates'
2009-08-08 Merge branch 'maint'
2009-08-05 Merge branch 'sb/read-tree'
2009-08-05 Merge branch 'jc/apply-epoch-patch'
2009-07-11 apply: notice creation/removal patches produced by...