[PATCH 2/5] difftool: don't overwrite modified files

2013-03-29 Thread John Keeping
After running the user's diff tool, git-difftool will copy any files that differ between the working tree and the temporary tree. This is useful when the user edits the file in their diff tool but is wrong if they edit the working tree file while examining the diff. Instead of copying

Re: [PATCH 2/5] difftool: don't overwrite modified files

2013-03-29 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: After running the user's diff tool, git-difftool will copy any files that differ between the working tree and the temporary tree. This is useful when the user edits the file in their diff tool but is wrong if they edit the working tree file while

Re: [PATCH 2/5] difftool: don't overwrite modified files

2013-03-29 Thread John Keeping
On Fri, Mar 29, 2013 at 01:20:50PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: After running the user's diff tool, git-difftool will copy any files that differ between the working tree and the temporary tree. This is useful when the user edits the file in their