When merging and resolving conflicts I right clicked on a conflicted file and used Resolve using their option. SourceTree however didn't keep non conflicted changes. Is this a bug or a feature? I was expecting way different results. Also that operation isn't shown in command history, so I ca't check what git command are used to this. When using standard
`git merge -Xtheirs` option I've different results.