merge-recursive: make "CONFLICT (rename/delete)" message show both paths
[gitweb.git] / Documentation / RelNotes / 2.11.1.txt
2017-01-17 Almost ready for 2.11.1