summaryrefslogtreecommitdiff
path: root/t/t3033-merge-toplevel.sh
Commit message (Expand)AuthorAgeFilesLines
* t3033: avoid 'ambiguous refs' warningJunio C Hamano2016-04-211-1/+1
* merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-231-0/+16
* merge: handle FETCH_HEAD internallyJunio C Hamano2015-04-291-5/+5
* merge: test the top-level merge driverJunio C Hamano2015-04-291-0/+136