Hi, On Sat, 17 Feb 2007, Junio C Hamano wrote: > Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > > > On Sat, 17 Feb 2007, Junio C Hamano wrote: > > > >> I do agree diff-file is too confusing with diff-files, but... > > > > ... but nobody writes out diff-files these days, right? > > Actually, "diff-files -c -p" while looking at a merge conflict > is the only thing I found "git diff" does not let me do. The > latter always gives condensed combined diff. So, diff2 is my preference. If anybody has better suggestions: go ahead. Ciao, Dscho - 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