mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Documentation: merge-output is not too verbose now.
We've squelched output from merge-recursive, and git-merge when used with recursive does not attempt the trivial one first anymore, so there won't be "Trying ... Nope." messages now. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
e7eb50347b
commit
5fe3acc43d
|
@ -906,18 +906,13 @@ of it as it can automatically (which in this case is just merge the `example`
|
|||
file, which had no differences in the `mybranch` branch), and say:
|
||||
|
||||
----------------
|
||||
Trying really trivial in-index merge...
|
||||
fatal: Merge requires file-level merging
|
||||
Nope.
|
||||
...
|
||||
Auto-merging hello
|
||||
CONFLICT (content): Merge conflict in hello
|
||||
Automatic merge failed; fix up by hand
|
||||
----------------
|
||||
|
||||
which is way too verbose, but it basically tells you that it failed the
|
||||
really trivial merge ("Simple merge") and did an "Automatic merge"
|
||||
instead, but that too failed due to conflicts in `hello`.
|
||||
It tells you that it did an "Automatic merge", which
|
||||
failed due to conflicts in `hello`.
|
||||
|
||||
Not to worry. It left the (trivial) conflict in `hello` in the same form you
|
||||
should already be well used to if you've ever used CVS, so let's just
|
||||
|
|
|
@ -121,10 +121,6 @@ Undo a merge or pull::
|
|||
+
|
||||
------------
|
||||
$ git pull <1>
|
||||
Trying really trivial in-index merge...
|
||||
fatal: Merge requires file-level merging
|
||||
Nope.
|
||||
...
|
||||
Auto-merging nitfol
|
||||
CONFLICT (content): Merge conflict in nitfol
|
||||
Automatic merge failed/prevented; fix up by hand
|
||||
|
|
Loading…
Reference in a new issue