Skip to content

Commit 767b925

Browse files
committed
Update readme text a bit
1 parent 0e879c1 commit 767b925

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,23 @@ a 3-way merge view to resolve the conflicts.
66

77
## Benefits
88

9-
By default git will add text conflict markers in the file with conflict, but
10-
that is only giving context from **two** versions, having a full **3-way** context
11-
is vastly superior (as well as being graphical is much easier to easier to
12-
review).
9+
By default git will just add text conflict markers in the file with conflict,
10+
but that is only giving context from **two** versions, having a full **3-way**
11+
context is vastly superior (as well as being graphical is much easier to easier
12+
to review).
1313

1414
And by using KDiff3 you will able to both review (and override) all the
1515
automatically resolved conflicts. Being able to see which versions that were
1616
selected automatically can often be a big help in determing how to resolve
1717
conflicts that were not automatically resolved.
1818

19-
# Usage/example
19+
# Usage
2020

21-
## Create repository with a conflict
21+
## Example repository with a conflict
2222

23-
Modifying `.gitignore` on two branches, same change but one of them
24-
also adds a comment.
23+
This is an example where the file `.gitignore` is modified on two branches,
24+
which results in a conflict when rebasing. The changes are basically the same
25+
but one of them also adds a comment.
2526

2627
```bash
2728
$ git init
@@ -77,7 +78,7 @@ KDiff3 to resolve this automatically:
7778
![KDiff3 screenshot, manual diff alignmet](doc/images/kdiff3_manual_diffalignment.png)
7879

7980
Saving and quiting KDiff3, the script asks if you are satisfied with the result
80-
and want to add the file:
81+
and want to add the file to the index:
8182

8283
![Running script screenshot](doc/images/run_script_002.png)
8384

0 commit comments

Comments
 (0)