2 Commits (e697e4cd1fc492e312a396211bafc629d6297ebd)

Author SHA1 Message Date
Johannes Schindelin f953831e03 merge-recursive: add/add really is modify/modify with an empty base 18 years ago
Junio C Hamano c93be3b539 add test case for recursive merge 18 years ago