diff options
author | Jens Lehmann <Jens.Lehmann@web.de> | 2009-03-20 08:48:55 +0100 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2009-03-20 14:44:28 -0700 |
commit | e27430e777edeb777cdd02a777e1e3a4608a0b41 (patch) | |
tree | 746684bbf737d48662b8d4a230af4b3ad326f5f1 /.gitattributes | |
parent | git-gui: don't hide the Browse button when resizing the repo chooser (diff) | |
download | tgif-e27430e777edeb777cdd02a777e1e3a4608a0b41.tar.xz |
git-gui: Fix merge conflict display error when filename contains spaces
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>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions