Merge branch 'jk/difftool-no-overwrite-on-copyback'