1. 073678b mergetools: simplify how we handle "vim" and "defaults" by David Aguilar ยท 12 years ago