amend a merge commit breaks it

[hqx]

trafficstars

It seems, when I amend a merge commit in gitx (e.g. to add some summary text) then it loses the merge info.

[duncanbeevers]

@hqx Have you verified this does not happen when using the git command-line client?

[hqx]

yes. git commit --amend ... edit message, save, close editor does not break the merge commit. (tested with some older version of git 3 month ago when I postet the issue and tested now again with git version 1.7.9)

doing this in gitx does break it (and already resolved conflicts will be conflicts again, when I try to repeat the merge)