1. 919df31 Collect merge-related tests to t64xx by Elijah Newren · 4 years, 5 months ago[Renamed from t/t6021-merge-criss-cross.sh]
  2. 42d180d t602[1236], t6034: modernize test formatting by Elijah Newren · 4 years, 11 months ago
  3. dcee037 doc: replace MARC links with lore.kernel.org by Denton Liu · 5 years ago
  4. d45366e merge: deprecate 'git merge <message> HEAD <commit>' syntax by Junio C Hamano · 10 years ago
  5. efe6de6 update URL to the marc.info mail archive by Ondřej Bílka · 11 years ago
  6. 8ec0dd6 t6021: add a new test for git-merge-resolve by Miklos Vajna · 17 years ago
  7. a6080a0 War on whitespace by Junio C Hamano · 18 years ago
  8. 36889a5 tests: merge-recursive is usable without Python by Junio C Hamano · 18 years ago
  9. 82e5a82 Fix more typos, primarily in the code by Pavel Roskin · 19 years ago
  10. abb7c7b Optionally work without python by Johannes Schindelin · 19 years ago
  11. 7057463 New test case: Criss-cross merge by Fredrik Kuivinen · 19 years ago