Re: [PATCH v3] difftool --dir-diff: allow changing any clean working tree file

2013-05-29 Thread Junio C Hamano
Kenichi Saita writes: > The temporary directory prepared by "difftool --dir-diff" to > show the result of a change can be modified by the user via > the tree diff program, and we try hard not to lose changes > to them after tree diff program returns to us. Thanks; will queue (unless there are ot

[PATCH v3] difftool --dir-diff: allow changing any clean working tree file

2013-05-29 Thread Kenichi Saita
The temporary directory prepared by "difftool --dir-diff" to show the result of a change can be modified by the user via the tree diff program, and we try hard not to lose changes to them after tree diff program returns to us. However, the set of files to be copied back is computed differently bet