diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-11 11:09:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-11 11:09:30 -0700 |
| commit | 5948fb6eafc5e8f810c9c4c0056f881d2f2c63b0 (patch) | |
| tree | 961d37953de476de94b832052c89dbf8d2a4511f /git-config.html | |
| parent | 53cd02b2a9159e3a20482f074bfc1a82e2e52ee1 (diff) | |
| download | git-htmldocs-5948fb6eafc5e8f810c9c4c0056f881d2f2c63b0.tar.gz | |
Autogenerated HTML docs for v2.38.0-83-gd420d
Diffstat (limited to 'git-config.html')
| -rw-r--r-- | git-config.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-config.html b/git-config.html index c9f5c855f..541b82775 100644 --- a/git-config.html +++ b/git-config.html @@ -8503,7 +8503,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>.
|