merge done by git-cola incorrect one-liner

[sthalik]

The one-line message on the commit list is wrong/unusual.

Might be caused by

[merge]
        log = 75

[sthalik]

Shows the same with git-forest, might be the actual merge generated by Cola having incorrect message. Normally merge looks like:

Merge branch 'unstable' into trackhat-ui──(c3fef33)

But the one I did with cola looks like:

• unstable: qfc: increase precision──(95080ba)

[davvid]

This was worth fixing for 2.4, so I think I just merged the last topic and will be releasing v2.4 shortly. This merge was done with the fix. Please test it if you can in case I goofed ;-) Thanks for the report.

[sthalik]

Gives the following commit message

commit 4f5439ff0427e5061c07d91c2f5b2e803695533f
Merge: fd8843b 16b12d9
Author: Stanislaw Halik 
Date:   Sun Oct 11 11:47:34 2015 +0200
    Merge branch 'aa' into unstable
    * aa:
      xccc
      v

Should be good, thanks.