3 Commits (9937cbf491094abacd323e8815cbec4953d5813d)

Author SHA1 Message Date
Johannes Schindelin abb7c7b31c Optionally work without python 19 years ago
Junio C Hamano 724b511d4f merge-recursive: conflicting rename case. 19 years ago
Junio C Hamano b825e6ff5d t/t6022: a new test for renaming merge. 19 years ago