Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2008-09-03 | tests: use "git xyzzy" form (t7200 - t9001) | 1 | -1/+1 | |
2008-07-23 | t7601: extend the 'merge picks up the best result' test | 1 | -0/+15 | |
2008-07-21 | builtin-merge: give a proper error message for invalid strategies in config | 1 | -0/+12 | |
2008-07-06 | Fix t7601-merge-pull-config.sh on AIX | 1 | -7/+7 | |
2008-06-30 | Add new test to ensure git-merge handles pull.twohead and pull.octopus | 1 | -0/+129 |