diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/Documentation/git-merge-index.txt | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/Documentation/git-merge-index.txt')
| -rw-r--r-- | third_party/git/Documentation/git-merge-index.txt | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/third_party/git/Documentation/git-merge-index.txt b/third_party/git/Documentation/git-merge-index.txt index 2ab84a91e5..02676fb391 100644 --- a/third_party/git/Documentation/git-merge-index.txt +++ b/third_party/git/Documentation/git-merge-index.txt @@ -54,24 +54,20 @@ original is first. But the argument order to the 3-way merge program Examples: ----- -torvalds@ppc970:~/merge-test> git merge-index cat MM -This is MM from the original tree. # original -This is modified MM in the branch A. # merge1 -This is modified MM in the branch B. # merge2 -This is modified MM in the branch B. # current contents ----- + torvalds@ppc970:~/merge-test> git merge-index cat MM + This is MM from the original tree. # original + This is modified MM in the branch A. # merge1 + This is modified MM in the branch B. # merge2 + This is modified MM in the branch B. # current contents or ----- -torvalds@ppc970:~/merge-test> git merge-index cat AA MM -cat: : No such file or directory -This is added AA in the branch A. -This is added AA in the branch B. -This is added AA in the branch B. -fatal: merge program failed ----- + torvalds@ppc970:~/merge-test> git merge-index cat AA MM + cat: : No such file or directory + This is added AA in the branch A. + This is added AA in the branch B. + This is added AA in the branch B. + fatal: merge program failed where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error |