mergetools / gvimdiffon commit Merge branch 'jk/stash-options' (f693bb0)
   1. "$MERGE_TOOLS_DIR/vimdiff"