Commit message (Expand) | Author | Age | |
---|---|---|---|
* | t6021: add a new test for git-merge-resolve | Miklos Vajna | 2008-07-13 |
* | War on whitespace | Junio C Hamano | 2007-06-07 |
* | tests: merge-recursive is usable without Python | Junio C Hamano | 2006-10-27 |
* | Fix more typos, primarily in the code | Pavel Roskin | 2006-07-10 |
* | Optionally work without python | Johannes Schindelin | 2006-02-18 |
* | New test case: Criss-cross merge | Fredrik Kuivinen | 2005-12-03 |