git-branch: display "was sha1" on branch deletion rather than just "sha1"
[gitweb.git] / t / t7606-merge-custom.sh
2008-09-16 Merge branch 'jc/maint-template-permbits'
2008-09-16 Merge branch 'mh/maint-honor-no-ssl-verify'
2008-09-13 Sync with 1.6.0.2
2008-09-10 Merge branch 'maint'
2008-09-10 tests: use "git foo" without dash in strings
2008-09-10 Merge branch 'ho/dashless'
2008-09-08 Merge branch 'jc/cc-ld-dynpath'
2008-09-08 Merge branch 'jc/hide-cr-in-diff-from-less'
2008-09-08 Merge branch 'jc/maint-checkout-fix'
2008-09-07 Merge updated git-gui and gitk that call each other
2008-09-06 Merge branch 'maint'
2008-09-05 Merge branch 'jc/maint-log-grep'
2008-09-03 Merge branch 'maint'
2008-09-03 Merge branch 'tr/filter-branch'
2008-09-03 Merge branch 'np/maint-safer-pack'
2008-09-03 Merge branch 'jc/author-nickname'
2008-09-03 Merge branch 'maint'
2008-09-03 Merge branch 'np/maint-safer-pack' into np/pack
2008-08-31 Merge branch 'maint'
2008-08-31 Merge branch 'maint'
2008-08-30 Merge branch 'sb/daemon'
2008-08-29 Merge branch 'maint'
2008-08-28 Merge branch 'mv/merge-custom'
2008-08-24 t7606: fix custom merge test
2008-07-30 Add a new test for using a custom merge strategy