Hi, On Tue, 13 Mar 2007, Andy Parkins wrote: > So what I thought I was formatting as (for example) > > Conflicts: > file.c > * Chose upstream version over mine, but integrated my small typo fix. > > Was appearing in the log display as > > Conflicts: > file.c > * Chose upstream version over mine, but integrated my small typo fix. > > Which isn't how I'd intended at all. > > The fix is of course - no tabs. Tabs for formatting is always going to > cause trouble, so this patch swaps the tab for spaces. And of course the next guy will have the reverse problem, because he typed <TAB><SPACE> instead of <SPACE>*5. What do you tell _him_ after "fixing" this issue? "Do as _I_ do"? 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