mergetools / vimdiff3on commit rebase: make resolve message clearer for inexperienced users (5fdacc1)
   1. "$MERGE_TOOLS_DIR/vimdiff"