How to save changes to HEAD in branch merge?

[codeyoulateralligator]

Hi,

I am trying to merge a branch into another branch. The behavior in Winmerge seems to have changed. I remember in the past there was a button like "Mark as resolved"?

How should i use it now? If i make any changes to HEAD, click save then the changes are lost as soon as i reopen the file:

Winmerge:

See, i have added some random test line in the HEAD view (in Winmerge, basically manual conflict resolution). How do i now save this and mark as resolved so that it appears correctly in my merge commit?

I now click "Resolved" from here:

But once i get to the merge commit i can see that the merge tags are still there.

How to make manual changes to HEAD, save and mark as reolved?

[sdottaka]

Please tell me the contents of the Command Line displayed by selecting [Help]-> [Configuration] when WinMerge is started by selecting the "edit conflict" menu item.

I want to know if the /o option is set properly.