Skip to content

Commit 96f3788

Browse files
committed
Adjusted filename in git merge output
The previous operations on iss53 were clearly on index.html, so the merge output should reflect that too for consistency. :)
1 parent 8fd4b18 commit 96f3788

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

book/03-git-branching/sections/basic-branching-and-merging.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ $ git checkout master
155155
Switched to branch 'master'
156156
$ git merge iss53
157157
Merge made by the 'recursive' strategy.
158-
README | 1 +
158+
index.html | 1 +
159159
1 file changed, 1 insertion(+)
160160
----
161161

0 commit comments

Comments
 (0)