mergetools / vimdiff2on commit Merge branch 'bc/reread-attributes-during-rebase' (c8ada15)
   1. "$MERGE_TOOLS_DIR/vimdiff"