File tree Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -104,7 +104,7 @@ public void CanMergeRepos()
104
104
105
105
MergeResult mergeResult = repo . Merge ( repo . Branches [ "FirstBranch" ] . Tip ) ;
106
106
107
- var mergeCommit = repo . Commit ( "Merge First+Second" ) ;
107
+ var mergeCommit = repo . Commit ( "Merge First+Second" , Constants . Signature , Constants . Signature ) ;
108
108
109
109
Assert . Equal ( mergeCommit . Tree . Count , originalTreeCount + 3 ) ; //Expecting original tree count plussed by the 3 added files.
110
110
Assert . Equal ( mergeCommit . Parents . Count ( ) , 2 ) ; //Merge commit should have 2 parents
Original file line number Diff line number Diff line change @@ -193,6 +193,11 @@ public interface IRepository : IDisposable
193
193
/// </summary>
194
194
IEnumerable < MergeHead > MergeHeads { get ; }
195
195
196
+ /// <summary>
197
+ /// Merges the given commit into HEAD.
198
+ /// </summary>
199
+ MergeResult Merge ( Commit commit ) ;
200
+
196
201
/// <summary>
197
202
/// Manipulate the currently ignored files.
198
203
/// </summary>
You can’t perform that action at this time.
0 commit comments