tests: document cherry-pick behavior in face of conflicts
[gitweb.git] / t / t7608-merge-messages.sh
2009-08-16 Merge branch 'lt/block-sha1'
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-09 merge: indicate remote tracking branches in merge message
2009-08-09 merge: fix incorrect merge message for ambiguous tag...
2009-08-09 add tests for merge message headings