Adjust error reporting from merge failures and use LC_ALL=C for git#8548
Merged
Commits
Commits on Oct 16, 2019
Commits on Oct 22, 2019
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Oct 23, 2019
Commits on Oct 29, 2019
Commits on Oct 30, 2019
- committed
- committed
- committed
Commits on Oct 31, 2019
- committed
- committed
- authored
- committed
- authored
Commits on Nov 1, 2019
Commits on Nov 3, 2019
Commits on Nov 5, 2019
Commits on Nov 6, 2019
- authored
- authored
- committed