Skip to content

Commit 04f1c4c

Browse files
committed
🔥 the emoji from example name
1 parent faa5a92 commit 04f1c4c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎ObjectiveGitTests/GTRepository+PullSpec.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240
});
241241

242242
/// Conflict During Merge
243-
it(@"erupts in a ball of 🔥 with a merge conflict ", ^{
243+
it(@"fails to merge whene there is a conflict", ^{
244244
// Stage a conflict by adding the same file with different contents to both repos
245245
GTCommit *localCommit = createCommitInRepository(@"Local commit", [@"TestLocal" dataUsingEncoding:NSUTF8StringEncoding], @"test.txt", localRepo);
246246
expect(localCommit).notTo(beNil());

0 commit comments

Comments
 (0)