tests: document cherry-pick behavior in face of conflicts
[gitweb.git] / t / t7004 /
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