mergetools / gvimdiffon commit wt-status: give better advice when cherry-pick is in progress (b95e66f)
   1. "$MERGE_TOOLS_DIR/vimdiff"