mergetools / gvimdiff3on commit Merge branch 'sg/complete-decorate-full-not-long' (465868a)
   1. "$MERGE_TOOLS_DIR/vimdiff"