On Sun, Mar 24, 2013 at 1:19 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Admittedly I do not use difftool myself, and I have long assumed > that difftool users are using the tools to _view_ the changes, but > apparently some of the tools let the user muck with what is shown, > and also apparently people seem to like the fact that they can make > changes. So I've led to believe the "update in difftool, take the > change back to working tree, either by making symbolic links or > copying them back" behaviour was a _feature_. Definitely. Here's how I use it: http://matthewlmcclure.com/s/2013/03/14/use-emacs-dircmp-mode-as-a-git-difftool.html -- Matt McClure http://www.matthewlmcclure.com http://www.mapmyfitness.com/profile/matthewlmcclure -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html