mergetools / gvimdiffon commit Merge branch 'kb/status-ignored-optim-2' (3684101)
   1. "$MERGE_TOOLS_DIR/vimdiff"