code: function merge(grunt, dir, mergeOptions, mergeFromBranch, msgPrefix, msg, done) {
  
    exec('git merge --no-ff ' + (mergeOptions || "") + ' -m "' + msgPrefix + ' ' + msg + '" ' + mergeFromBranch, {
      grunt: grunt,
      dir: dir,
      done: done
    });
  
  }
docs: ---