| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | builtin/merge.c: fix a bug with trivial mergesen/merge-trivial-fix | Elijah Newren | 2016-04-12 | 1 | -1/+1 |
| * | t7605: add a testcase demonstrating a bug with trivial merges | Elijah Newren | 2016-04-12 | 1 | -1/+5 |
| * | 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 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |