mergetools / gvimdiffon commit Merge branch 'jk/unavailable-can-be-missing' (cf31579)
   1. "$MERGE_TOOLS_DIR/vimdiff"