Re: [PATCH 4/5] Documentation: document AUTO_MERGE
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Apr 15, 2023, 05:08 UTC
- Message-ID
- <CAPig+cQQVby2g+_kfucbYdwOZW5_CEyyyOex=4hXoCJt7TkjeA@mail.gmail.com>
- In-Reply-To
- <0cdd4ab3d739e07357ea9efef2cdece633db6ebb.1681495119.git.gitgitgadget@gmail.com>
On Fri, Apr 14, 2023 at 2:13 PM Philippe Blain via GitGitGadget <gitgitgadget@gmail.com> wrote:
Show 24 quoted lines
> Add some documentation for AUTO_MERGE in git-diff(1), git-merge(1), > gitrevisions(7) and in the user manual. > > Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> > --- > diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt > @@ -1343,6 +1343,33 @@ $ git diff -3 file.txt # diff against stage 3 > +------------------------------------------------- > +$ git diff AUTO_MERGE > +diff --git a/file.txt b/file.txt > +index cd10406..8bf5ae7 100644 > +--- a/file.txt > ++++ b/file.txt > +@@ -1,5 +1 @@ > +-<<<<<<< HEAD:file.txt > +-Hello world > +-======= > +-Goodbye > +->>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt > ++Goodbye world > +------------------------------------------------- > + > +Notice that the diff shows we deleted the conflict markers and both versions, > +and wrote "Goodbye world" instead.
Some grammatical problem here. Perhaps s/and both/in both/, or maybe just drop "and both versions"?