Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | tests: use "git foo" without dash in strings | Nanako Shiraishi | 2008-09-09 | 1 | -1/+1 |
* | t7606: fix custom merge test | Junio C Hamano | 2008-08-23 | 1 | -2/+5 |
* | Add a new test for using a custom merge strategy | Miklos Vajna | 2008-07-29 | 1 | -0/+46 |