mergetools / gvimdiffon commit Merge branch 'sg/complete-untracked-filter' (b7f5716)
   1. "$MERGE_TOOLS_DIR/vimdiff"