mergetools / gvimdiff2on commit Merge branch 'cc/interpret-trailers' (d4c4f18)
   1. "$MERGE_TOOLS_DIR/vimdiff"