diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 09:45:03 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 22:04:21 +0300 |
| commit | cf6cac20059123d6ec3f867bb3692df62db52cf9 (patch) | |
| tree | 99e0ee363183782b239257d69d28282c44100136 /Documentation/git-merge.txt | |
| parent | 3a06386e314565108ad56a9bdb8f7b80ac52fb69 (diff) | |
documentation: wording improvements
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 8625c5cb0e..e8ab340319 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -336,7 +336,7 @@ After seeing a conflict, you can do two things: You can work through the conflict with a number of tools: * Use a mergetool. `git mergetool` to launch a graphical - mergetool which will work you through the merge. + mergetool which will work through the merge with you. * Look at the diffs. `git diff` will show a three-way diff, highlighting changes from both the `HEAD` and `MERGE_HEAD` |