mergetools / gvimdiff3on commit Merge branch 'sg/trace2-rename' (e9eaaa4)
   1. "$MERGE_TOOLS_DIR/vimdiff"