| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | builtin/merge.c: fix a bug with trivial merges | Elijah Newren | 2016-04-12 |
| * | t7605: add a testcase demonstrating a bug with trivial merges | Elijah Newren | 2016-04-12 |
| * | tests: use "git xyzzy" form (t7200 - t9001) | Nanako Shiraishi | 2008-09-03 |
| * | merge: fix numerus bugs around "trivial merge" area | Junio C Hamano | 2008-08-23 |
| * | Add a new test for git-merge-resolve | Miklos Vajna | 2008-07-13 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |