-
Committer:
Breezy landing bot
-
Author(s):
Jelmer Vernooij
-
Date:
2020-09-02 18:24:51 UTC
-
mfrom:
(7637.1.11 git-merge)
-
Revision ID:
breezy.the.bot@gmail.com-20200902182451-81chudv8zhwdqtkx
Some more improvements for merges in Git.
Merged from https://code.launchpad.net/~jelmer/brz/git-merge/+merge/390155