Age | Commit message (Expand) | Author |
---|---|---|
2010-06-11 | merge-recursive: demonstrate an incorrect conflict with submodule | Johannes Sixt |
2010-01-13 | Be more user-friendly when refusing to do something because of conflict. | Matthieu Moy |
2009-06-02 | refuse to merge during a merge | Clemens Buchacher |
2008-09-26 | Remove empty directories in recursive merge | Alex Riesen |
2008-09-03 | tests: use "git xyzzy" form (t0000 - t3599) | Nanako Shiraishi |
2008-08-24 | merge: fix numerus bugs around "trivial merge" area | Junio C Hamano |
2008-05-24 | tests: do not use implicit "git diff --no-index" | Junio C Hamano |
2007-06-07 | War on whitespace | Junio C Hamano |
2007-04-20 | Remove case-sensitive file in t3030-merge-recursive. | Brian Gernhardt |
2007-04-10 | t3030: merge-recursive backend test. | Junio C Hamano |