mergetools / gvimdiffon commit Merge branch 'tr/fd-gotcha-fixes' (1d1934c)
   1. "$MERGE_TOOLS_DIR/vimdiff"