diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:16 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:06:29 -0700 |
| commit | 3771d002571f6fc796ff3f54e9d5b875826e62ed (patch) | |
| tree | 87a73898a10c5182a3ab632a4207b4f846019e3a /Documentation/howto | |
| parent | 03b3431e6a36d9a529f49d938168043b463ca24b (diff) | |
| download | git-3771d002571f6fc796ff3f54e9d5b875826e62ed.tar.gz | |
documentation: fix choice of article
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/howto')
| -rw-r--r-- | Documentation/howto/maintain-git.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt index 29c473e5e0..013014bbef 100644 --- a/Documentation/howto/maintain-git.txt +++ b/Documentation/howto/maintain-git.txt @@ -411,7 +411,7 @@ Preparing a "merge-fix" A merge of two topics may not textually conflict but still have conflict at the semantic level. A classic example is for one topic -to rename an variable and all its uses, while another topic adds a +to rename a variable and all its uses, while another topic adds a new use of the variable under its old name. When these two topics are merged together, the reference to the variable newly added by the latter topic will still use the old name in the result. |