zeripath 8eeb2877d5 Adjust error reporting from merge failures and use LC_ALL=C for git (#8548 An error occurred ) ... There are two major components to this PR: * This PR handles merge and rebase failures from merging a little more nicely with Flash errors rather a 500. * All git commands are run in the LC_ALL="C" environment to ensure that error messages are in English. This DefaultLocale is defined in a way that if necessary (due to platform weirdness) it can be overridden at build time using LDFLAGS="-X "code.gitea.io/gitea/modules/git.DefaultLocale=C"" with C changed for the locale as necessary.		5 years ago
..
gitignore	Update gitignore list (#5258 An error occurred )	6 years ago
label	Add label descriptions (#3662 An error occurred )	7 years ago
license	Update licenses (#8752 An error occurred )	5 years ago
locale	Adjust error reporting from merge failures and use LC_ALL=C for git (#8548 An error occurred )	5 years ago
readme	Bindata is optional and over-writable on restart (#354 An error occurred )	8 years ago