mergetools / vimdiff2on commit Merge branch 'cc/interpret-trailers' (9d04401)
   1. "$MERGE_TOOLS_DIR/vimdiff"