| commit | e27430e777edeb777cdd02a777e1e3a4608a0b41 | |
| author | Jens Lehmann <Jens.Lehmann@web.de> | |
| Fri, 20 Mar 2009 07:48:55 +0000 (20 08:48 +0100) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 20 Mar 2009 21:44:28 +0000 (20 14:44 -0700) | ||
| tree | 746684bbf737d48662b8d4a230af4b3ad326f5f1 | treesnapshot (tar.gz zip) |
| parent | 379f84b8d19b5412aff5b9d6bd7bb1ada37b9353 | commitdiff |
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>
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>
| lib/mergetool.tcl | diffblobblamehistory |