mirror of
https://github.com/git/git.git
synced 2026-03-28 01:20:11 +01: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
No description provided
Languages
C
50.4%
Shell
38.8%
Perl
4.4%
Tcl
3.1%
Python
0.8%
Other
2.3%