Skip to content

Fixed example output of diff #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sedm0784 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed example output of diff #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions text/26_Advanced_Branching_And_Merging/0_Advanced_Branching_And_Merging.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ index), the diff will look like:
+++ b/file.txt
@@@ -1,1 -1,1 +1,1 @@@
- Hello world
-Goodbye
-Goodbye
++Goodbye world

This shows that our resolved version deleted "Hello world" from the
Expand Down Expand Up @@ -88,4 +88,4 @@ Each time you resolve the conflicts in a file and update the index:
$ git add file.txt

the different stages of that file will be "collapsed", after which
git-diff will (by default) no longer show diffs for that file.
git-diff will (by default) no longer show diffs for that file.