def proc_merge(base, opts = {})
      begin
        return merge(base, opts)
      rescue GitExecuteError => merge_error
        raise MergeError.new(merge_error.message, self)
      end
    end
def proc_merge(base, opts = {})
      begin
        return merge(base, opts)
      rescue GitExecuteError => merge_error
        raise MergeError.new(merge_error.message, self)
      end
    end
Executes a merge, but translates any {GitExecuteError} to a {MergeError}

 @param (see #merge)
 @option (see #merge)
 @raise [MergeError] if there is a problem executing the merge