Keep both

[ahoereth]

How would one handle a merge conflict like the following, where I would want to keep both changes?

<<<<<<< ours
  /** An extensive
   * comment. */
  bool some_boolean;

||||||| base
=======
  /** Some other
   * multiline
   * comment. */
  bool another_variable;

>>>>>>> theirs

Opening that file and running :MergetoolStart gives me the following:

My vim-mergetool configuration:

let g:mergetool_layout = 'mr'
let g:mergetool_prefer_revision = 'local'