[Bálint Réczey <balint@xxxxxxxxxxxxxxx>]

Hi All,

I usually leave the "Conflicts: ..." in the commit message after
resolving conflicts to document that the merge was not automatic.
Should I continue doings so you prefer removing this from the commit message?
Guy raised the issue in https://code.wireshark.org/review/#/c/4438 ,
but I think the question deserves more attention than being just a
valid code-review comment.

Cheers,
Balint