mergetools / gvimdiff2on commit status: show commit sha1 in "You are currently cherry-picking" message (bffd809)
   1. "$MERGE_TOOLS_DIR/vimdiff"