4 Commits (a990999e0df3d0518a2fef60feb1ec269e36ada6)

Author SHA1 Message Date
Junio C Hamano 36889a5078 tests: merge-recursive is usable without Python 18 years ago
Pavel Roskin 82e5a82fd7 Fix more typos, primarily in the code 19 years ago
Johannes Schindelin abb7c7b31c Optionally work without python 19 years ago
Fredrik Kuivinen 7057463463 New test case: Criss-cross merge 19 years ago