mergetools / gvimdiffon commit Merge branch 'ls/editor-waiting-message' (0c69a13)
   1. "$MERGE_TOOLS_DIR/vimdiff"