Age | Commit message (Expand) | Author | Files | Lines |
2015-04-29 | merge: deprecate 'git merge <message> HEAD <commit>' syntax | Junio C Hamano | 1 | -3/+3 |
2013-07-22 | update URL to the marc.info mail archive | Ondřej Bílka | 1 | -1/+1 |
2008-07-13 | t6021: add a new test for git-merge-resolve | Miklos Vajna | 1 | -0/+4 |
2007-06-07 | War on whitespace | Junio C Hamano | 1 | -1/+1 |
2006-10-27 | tests: merge-recursive is usable without Python | Junio C Hamano | 1 | -6/+0 |
2006-07-10 | Fix more typos, primarily in the code | Pavel Roskin | 1 | -1/+1 |
2006-02-18 | Optionally work without python | Johannes Schindelin | 1 | -0/+6 |
2005-12-03 | New test case: Criss-cross merge | Fredrik Kuivinen | 1 | -0/+92 |