Comment 7 for bug 286834

Revision history for this message
Vincent Ladeuil (vila) wrote :

The attached script reproduces the bug in a simpler way.

The root problem is really to commit files that were involved in a conflict resolution. 'commit' knows how to handle them but not 'gcommit'.

I'm working on a fix.