Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2010-08-24 | t7606: Avoid using head as a file name | 1 | -4/+4 | |
2010-08-15 | merge: let custom strategies intervene in trivial merges | 1 | -3/+33 | |
2010-08-15 | t7606 (merge-theirs): modernize style | 1 | -26/+40 | |
2008-09-09 | tests: use "git foo" without dash in strings | 1 | -1/+1 | |
2008-08-23 | t7606: fix custom merge test | 1 | -2/+5 | |
2008-07-29 | Add a new test for using a custom merge strategy | 1 | -0/+46 |