| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2016-04-12 | builtin/merge.c: fix a bug with trivial merges |  Elijah Newren | 1 | -1/+1 |
| 2016-04-12 | t7605: add a testcase demonstrating a bug with trivial merges | Elijah Newren | 1 | -1/+5 |
| 2008-09-03 | tests: use "git xyzzy" form (t7200 - t9001) |  Nanako Shiraishi | 1 | -1/+1 |
| 2008-08-23 | merge: fix numerus bugs around "trivial merge" area |  Junio C Hamano | 1 | -1/+3 |
| 2008-07-13 | Add a new test for git-merge-resolve |  Miklos Vajna | 1 | -0/+46 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |