merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t7004 /
2007-07-03 Merge branch 'maint'
2007-07-02 Merge branch 'ew/svn'
2007-07-02 Merge branch 'ns/stash'
2007-07-02 Merge branch 'js/rebase'
2007-07-02 Merge branch 'jc/diffcore'
2007-07-02 Merge 1.5.2.3 in
2007-07-01 Merge branch 'rs/diff'
2007-07-01 Merge branch 'jc/quote'
2007-07-01 t7004: ship trustdb to avoid gpg warnings
2007-07-01 Merge branch 'ml/worktree'
2007-07-01 Merge branch 'ei/worktree+filter'
2007-07-01 Merge branch 'fl/config'
2007-06-30 Merge branch 'cr/tag'
2007-06-29 Add test-script for git-tag