mirror of
https://github.com/git-for-windows/git.git
synced 2026-04-17 16:20:48 -05:00
e27430e777edeb777cdd02a777e1e3a4608a0b41
When a merge conflict occurs in a file with spaces in the filename, git-gui showed wrongly "LOCAL: deleted". Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Description
Releases
335
Languages
C
51.5%
Shell
37.6%
Perl
4.2%
Tcl
3%
Python
0.8%
Other
2.7%