Commit message for merge conflict is not shown when I face merge conflict.
First time I met this situation I thought it is part of modification of the version.
But when I got back to File Status tab after I went to Log / History tab, the message I expected was there in the message place.