mergetools / gvimdiffon commit config.txt: move notes.* to a separate file (e50472d)
   1. "$MERGE_TOOLS_DIR/vimdiff"