mergetools / gvimdiffon commit Merge branch 'jc/apply-ws-fix-expands' (38459ee)
   1. "$MERGE_TOOLS_DIR/vimdiff"