diff options
Diffstat (limited to 'git-mergetool.html')
| -rw-r--r-- | git-mergetool.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.html b/git-mergetool.html index f640addad..dc6726b54 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -988,7 +988,7 @@ mergetool.hideResolved possible and write the <em>MERGED</em> file containing conflict markers around
any conflicts that it cannot resolve; <em>LOCAL</em> and <em>REMOTE</em> normally
represent the versions of the file from before Git’s conflict
- resolution. This flag causes <em>LOCAL</em> and <em>REMOTE</em> to be overwriten so
+ resolution. This flag causes <em>LOCAL</em> and <em>REMOTE</em> to be overwritten so
that only the unresolved conflicts are presented to the merge tool. Can
be configured per-tool via the <code>mergetool.<tool>.hideResolved</code>
configuration variable. Defaults to <code>false</code>.
|