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