merge-recursive: handle D/F conflict case more carefully.
[git/dscho.git] / RelNotes
blobc543b1d1eedf821fe1e8c31d902a719bfc6ffb20
1 Documentation/RelNotes-1.5.2.txt