mergetools / gvimdiffon commit Merge branch 'jk/pkt-line-cleanup' (e013bda)
   1. "$MERGE_TOOLS_DIR/vimdiff"