| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | t7601: extend the 'merge picks up the best result' test | Miklos Vajna | 2008-07-23 | 1 | -0/+15 |
| * | builtin-merge: give a proper error message for invalid strategies in config | Miklos Vajna | 2008-07-21 | 1 | -0/+12 |
| * | Fix t7601-merge-pull-config.sh on AIX | Miklos Vajna | 2008-07-06 | 1 | -7/+7 |
| * | Add new test to ensure git-merge handles pull.twohead and pull.octopus | Miklos Vajna | 2008-06-30 | 1 | -0/+129 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |