Re: [RFD] Combine diff improvements

2013-03-14 Thread Junio C Hamano
Antoine Pelisse writes: > While if we invert the two parents order we will have: > - 3 > --1 > --2 > - 4 > -3 > -4 > > While clearly, in both cases, the optimal solution would be close to: > - 3 > --1 > --2 > -3 > --4 We should shoot for better readability as the primary goal. When I am view

Re: [RFD] Combine diff improvements

2013-03-14 Thread Junio C Hamano
Antoine Pelisse writes: > I would like to discuss some improvements. ;-) > The current implementation doesn't look for optimal solution but for the > easiest/greedy solution. Yes, you nailed it. > Does it make any sense? And is it worth implementing? Probably yes, and definitely. -- To unsu