diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-06-13 10:04:01 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-06-13 10:04:01 +0000 |
commit | 6fb124cd538ba3d8d7c5da9bb979b3fd0e1b2925 (patch) | |
tree | 42399be6b1d4ba93c664dd7a38942975da9d06f7 /user-manual.txt | |
parent | dc8f25ba925d69ae6cd9477948a4681a6b9ba881 (diff) | |
download | git-htmldocs-6fb124cd538ba3d8d7c5da9bb979b3fd0e1b2925.tar.gz |
Autogenerated HTML docs for v1.5.6-rc2-45-gdc92c
Diffstat (limited to 'user-manual.txt')
-rw-r--r-- | user-manual.txt | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/user-manual.txt b/user-manual.txt index bfde507e0..64a820bf6 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -1254,16 +1254,15 @@ these three "file stages" represents a different version of the file: ------------------------------------------------- $ git show :1:file.txt # the file in a common ancestor of both branches -$ git show :2:file.txt # the version from HEAD, but including any - # nonconflicting changes from MERGE_HEAD -$ git show :3:file.txt # the version from MERGE_HEAD, but including any - # nonconflicting changes from HEAD. +$ git show :2:file.txt # the version from HEAD. +$ git show :3:file.txt # the version from MERGE_HEAD. ------------------------------------------------- -Since the stage 2 and stage 3 versions have already been updated with -nonconflicting changes, the only remaining differences between them are -the important ones; thus linkgit:git-diff[1] can use the information in -the index to show only those conflicts. +When you ask linkgit:git-diff[1] to show the conflicts, it runs a +three-way diff between the conflicted merge results in the work tree with +stages 2 and 3 to show only hunks whose contents come from both sides, +mixed (in other words, when a hunk's merge results come only from stage 2, +that part is not conflicting and is not shown. Same for stage 3). The diff above shows the differences between the working-tree version of file.txt and the stage 2 and stage 3 versions. So instead of preceding |