Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | tests: use "git xyzzy" form (t7200 - t9001) | Nanako Shiraishi | 2008-09-03 | 1 | -1/+1 |
* | merge: fix numerus bugs around "trivial merge" area | Junio C Hamano | 2008-08-23 | 1 | -1/+3 |
* | Add a new test for git-merge-resolve | Miklos Vajna | 2008-07-13 | 1 | -0/+46 |