mergetools / gvimdiffon commit status: suggest 'git merge --abort' when appropriate (b0a61ab)
   1. "$MERGE_TOOLS_DIR/vimdiff"