mergetools / gvimdiffon commit Merge branch 'ks/doc-checkout-previous' (7065665)
   1. "$MERGE_TOOLS_DIR/vimdiff"