mergetools / gvimdiffon commit Merge branch 'jc/apply-reject-noop-hunk' (59c465d)
   1. "$MERGE_TOOLS_DIR/vimdiff"