Age | Commit message (Expand) | Author |
---|---|---|
2020-11-20 | t7[5-9]*: adjust the references to the default branch name "main" | Johannes Schindelin |
2010-08-24 | t7606: Avoid using head as a file name | Brian Gernhardt |
2010-08-16 | merge: let custom strategies intervene in trivial merges | Jonathan Nieder |
2010-08-16 | t7606 (merge-theirs): modernize style | Jonathan Nieder |
2008-09-10 | tests: use "git foo" without dash in strings | Nanako Shiraishi |
2008-08-24 | t7606: fix custom merge test | Junio C Hamano |
2008-07-30 | Add a new test for using a custom merge strategy | Miklos Vajna |