Junio C Hamano wrote:
I have fixed a few more smallish (old) bugs after I tagged this, which
will be in 'master' shortly, but it seems that this cycle is stabilizing
fairly nicely. Let's have a successful 1.6.1 tagged on 20th. Please hunt
and fix bugs until then.
Even though it is not a 1.6.1 regression, I wonder about the merge
conflict issue in
http://thread.gmane.org/gmane.comp.version-control.git/100859/focus=101182
The patch in that post improved things somewhat, by making a correct
commit. Of course, the working tree then silently loses a file, which
could be seen as being worse than a fatal failure.
Anders.