Elijah Newren <[email protected]> writes:
> In commit 743474cbfa8b ("merge-recursive: provide a better label for
> diff3 common ancestor", 2019-08-17), the label for the common ancestor
> was changed from always being
>
> "merged common ancestors"
>
> to instead be based on the number of merge bases:
>
> >=2: "merged common ancestors"
> 1: <abbreviated commit hash>
> 0: "<empty tree>"
I just saw, while running "git checkout next && git merge master",
this:
diff --git a/packfile.c b/packfile.c
index 3220761fb4..6413693a17 100644
--- a/packfile.c
+++ b/packfile.c
@@ -16,7 +16,22 @@
#include "object-store.h"
#include "midx.h"
#include "commit-graph.h"
+<<<<<<< HEAD
#include "promisor-remote.h"
+||||||| merged common ancestors
+<<<<<<<<< Temporary merge branch 1
+||||||||| 瀉3.
+=========
+#include "promisor-remote.h"
+>>>>>>>>> Temporary merge branch 2
+||||||||| 瀉3.
+>>>>>>>>>>> Temporary merge branch 2
+=========
+#include "promisor-remote.h"
+>>>>>>>>> Temporary merge branch 2
+=======
+#include "promisor-remote.h"
+>>>>>>> master
char *odb_pack_name(struct strbuf *buf,
const unsigned char *hash,
where the common ancestor blocks are marked with random garbage.
I do not have time or patience to bisect and do not know if this is
a regression around this commit, but it smells suspiciously close.
