diff options
| author | Justin Lebar <jlebar@google.com> | 2014-03-31 15:11:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-31 15:16:22 -0700 |
| commit | a58088abe2011b6f486de8acd54432f6d9bcecfc (patch) | |
| tree | fdae618dee73d4a349c80321896d4f4a58344c35 /Documentation/diff-generate-patch.txt | |
| parent | cee0c2750bb5f1b38f15ef961517e03c2e39c9ec (diff) | |
| download | git-a58088abe2011b6f486de8acd54432f6d9bcecfc.tar.gz | |
Documentation: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-generate-patch.txt')
| -rw-r--r-- | Documentation/diff-generate-patch.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt index 55f499a160..843a20bac2 100644 --- a/Documentation/diff-generate-patch.txt +++ b/Documentation/diff-generate-patch.txt @@ -174,7 +174,7 @@ added, from the point of view of that parent). In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear -in either file1 nor file2). Also eight other lines are the same +in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`). When shown by `git diff-tree -c`, it compares the parents of a |