Hi, Even though the merge commit's message includes conflicted files by default, the *resolution* itself is lost, that is, it's hard or impossible to review how the author *resolved* said conflicts. The proposal is that an option like `-X clean` would commit a clean merge and leave out any conflicting hunks in the tree for a follow-up commit to resolve conflicts. That would be extremely helpful for a code reviewer to see how a possibly external contributor has dealt with upstream changes e.g. in a long-standing branch. Any comment would be appreciated. Thanks, Alireza
