mergetools / vimdiff2on commit fix cherry-pick/revert status after commit (4a72486)
   1. "$MERGE_TOOLS_DIR/vimdiff"