Junio C Hamano wrote: > David Aguilar <davvid@xxxxxxxxx> writes: > > > +1 for merge.conflictstyle = diff3, rerere.enabled = true, and > > log.decorate = short from me. I noticed others already mentioned > > these. > > As the inventor of rerere, I agree on rerere.enabled. It was made > opt-in only because I thought it was somewhat risky when the feature > was introduced, but it has been stable and useful, and it is long > overdue to be enabled by default. Agreed. I personally would like some interface to see what's going on behind the scenes because sometimes I've made a wrong resolution that gets carried around and I don't know of a way to clear them (other than manually hunting down the cached files). But this is not a deal-breaker, the feature works great. > I do not think of any downside with conflictstyle being diff3 (and > think of only upside). Same here. I recall reading about issues of a GSoC student resolving conflicts and setting up a mergetool. And he (or she?) mentioned the advice to configure diff3... I didn't even remember there was anything else. I wrote vimdiff3 precisely to edit diff3 output directly, and I've never looked back. -- Felipe Contreras
