mergetools / gvimdiffon commit Merge branch 'fc/remote-helpers-test-updates' (41e9da4)
   1. "$MERGE_TOOLS_DIR/vimdiff"