diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:03:26 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:03:26 -0700 |
commit | 3c9e56b75c4a9a6832d94a00f079ea68e8a281ca (patch) | |
tree | 5f5b11703f64319bcb71603c825d382f4703a763 /Documentation/user-manual.txt | |
parent | fbae3d9ace0b71f8db62cde127fa6fe24c40380c (diff) | |
parent | 235e8d591480d7e1378c27fe65c5529625d4b5be (diff) | |
download | git-3c9e56b75c4a9a6832d94a00f079ea68e8a281ca.tar.gz |
Merge branch 'jl/nor-or-nand-and' into maint
* jl/nor-or-nand-and:
code and test: fix misuses of "nor"
comments: fix misuses of "nor"
contrib: fix misuses of "nor"
Documentation: fix misuses of "nor"
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r-- | Documentation/user-manual.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index d4f9804462..022e74e616 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -4074,7 +4074,7 @@ the `HEAD` tree, and stage 3 to the `$target` tree. Earlier we said that trivial merges are done inside `git read-tree -m`. For example, if the file did not change -from `$orig` to `HEAD` nor `$target`, or if the file changed +from `$orig` to `HEAD` or `$target`, or if the file changed from `$orig` to `HEAD` and `$orig` to `$target` the same way, obviously the final outcome is what is in `HEAD`. What the above example shows is that file `hello.c` was changed from |