mergetools / gvimdiff2on commit status: introduce status.short to enable --short by default (4fb5166)
   1. "$MERGE_TOOLS_DIR/vimdiff"