RelNoteson commit mergetools: simplify how we handle "vim" and "defaults" (073678b)
   1Documentation/RelNotes/1.8.0.txt