merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t4040-whitespace-status.sh
2010-01-20 Merge branch 'jc/cache-unmerge'
2010-01-20 Merge branch 'js/exec-error-report'
2010-01-20 Merge branch 'jc/grep-lookahead'
2010-01-20 Merge branch 'jc/maint-strbuf-add-fix-doubling'
2010-01-20 Merge branch 'mm/conflict-advice'
2010-01-20 Merge branch 'da/difftool'
2010-01-20 Merge branch 'mh/rebase-fixup'
2010-01-20 Merge branch 'ns/rebase-auto-squash'
2010-01-20 Merge branch 'mh/rebase-fixup' (early part)
2010-01-20 Merge branch 'jk/warn-author-committer-after-commit'
2010-01-20 Merge branch 'sd/cd-p-show-toplevel'
2010-01-20 Sync with 1.6.6.1
2010-01-20 Merge branch 'maint'
2010-01-19 Merge branch 'maint'
2010-01-19 Merge branch 'jc/rerere'
2010-01-19 Merge branch 'pc/uninteresting-submodule-disappear...
2010-01-19 Merge branch 'nd/include-termios-for-osol'
2010-01-18 Merge branch 'tc/test-locate-httpd'
2010-01-18 Merge branch 'jh/commit-status'
2010-01-17 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-17 Merge branch 'tc/clone-v-progress'
2010-01-17 Merge branch 'tc/smart-http-restrict'
2010-01-17 Merge branch 'jk/run-command-use-shell'
2010-01-17 Merge branch 'sr/gfi-options'
2010-01-17 Merge branch 'maint'
2010-01-17 Merge branch 'cc/reset-more'
2010-01-13 Merge branch 'jc/checkout-merge-base'
2010-01-13 Merge branch 'rs/maint-archive-match-pathspec'
2010-01-13 Merge branch 'il/vcs-helper'
2010-01-13 Merge branch 'cc/reset-more'
2010-01-13 Merge branch 'nd/sparse'
2010-01-12 Merge branch 'maint'
2010-01-10 Merge branch 'tr/http-updates'
2010-01-10 Merge branch 'jk/maint-1.6.5-reset-hard'
2010-01-10 Merge branch 'jk/push-to-delete'
2010-01-10 Merge branch 'mm/config-path'
2010-01-10 Merge branch 'pm/cvs-environ'
2010-01-10 Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule...
2010-01-10 Merge branch 'bg/maint-remote-update-default'
2010-01-10 Merge branch 'mm/diag-path-in-treeish'
2010-01-10 Merge branch 'fc/opt-quiet-gc-reset'
2010-01-10 Merge branch 'maint'
2010-01-07 Merge branch 'js/filter-branch-prime'
2010-01-07 Merge branch 'sb/maint-octopus'
2010-01-07 Merge branch 'mg/tag-d-show'
2010-01-07 Merge branch 'so/cvsserver-update'
2010-01-07 Merge branch 'bg/maint-add-all-doc'
2010-01-07 Merge branch 'mv/commit-date'
2010-01-07 Merge branch 'mo/bin-wrappers'
2010-01-03 Merge branch 'maint'
2009-12-31 Merge branch 'maint'
2009-12-30 Merge branch 'maint'
2009-12-28 Merge branch 'jk/1.7.0-status'
2009-12-28 Merge branch 'maint'
2009-12-26 Merge branch 'maint'
2009-12-26 Merge branch 'gb/1.7.0-diff-whitespace-only-output'
2009-12-26 Merge branch 'jc/1.7.0-diff-whitespace-only-status'
2009-08-27 Make test case number unique