Age | Commit message (Expand) | Author | Files | Lines |
2011-02-16 | mergetool: don't skip modify/remove conflicts | Martin von Zweigbergk | 1 | -6/+34 |
2010-11-09 | tests: add missing && | Jonathan Nieder | 1 | -1/+1 |
2010-08-24 | t7610: cd inside subshell instead of around | Brian Gernhardt | 1 | -23/+26 |
2010-08-17 | mergetool: Skip autoresolved paths | David Aguilar | 1 | -12/+34 |
2009-01-31 | mergetool: fix running mergetool in sub-directories | Charles Bailey | 1 | -1/+1 |
2009-01-31 | mergetool: Add a test for running mergetool in a sub-directory | Charles Bailey | 1 | -19/+51 |
2009-01-27 | mergetool: respect autocrlf by using checkout-index | Charles Bailey | 1 | -2/+13 |
2008-09-03 | tests: use "git xyzzy" form (t7200 - t9001) | Nanako Shiraishi | 1 | -1/+1 |
2008-07-13 | t/: Use "test_must_fail git" instead of "! git" | Stephan Beyer | 1 | -1/+1 |
2008-07-04 | Fix executable bits in t/ scripts | Junio C Hamano | 1 | -0/+0 |
2008-03-05 | Add a very basic test script for git mergetool | Charles Bailey | 1 | -0/+46 |