| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge-recursive: refuse to merge binary files | Johannes Schindelin | 2007-06-04 | 1 | -0/+14 |
| * | Fix permissions on test scripts | Alex Riesen | 2007-04-16 | 1 | -0/+0 |
| * | Get rid of the dependency to GNU diff in the tests | Johannes Schindelin | 2007-03-04 | 1 | -2/+2 |
| * | t6024-recursive-merge: quiet down this test | Eric Wong | 2006-12-28 | 1 | -43/+47 |
| * | Display 'theirs' branch name when possible in merge. | Shawn O. Pearce | 2006-12-23 | 1 | -3/+3 |
| * | merge-recursive: add/add really is modify/modify with an empty base | Johannes Schindelin | 2006-12-12 | 1 | -1/+11 |
| * | add test case for recursive merge | Junio C Hamano | 2006-12-12 | 1 | -0/+70 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |