TortoiseGitMerge: Accept more patch files
commit6f003d69c33aa3d058e82d8466aa215eb713ce9b
authorSven Strickroth <email@cs-ware.de>
Wed, 23 Jan 2013 20:00:59 +0000 (23 21:00 +0100)
committerSven Strickroth <email@cs-ware.de>
Wed, 23 Jan 2013 20:16:43 +0000 (23 21:16 +0100)
tree4b93eb4a155bf7e816270bf495a0b79025ee70ef
parentaf4d6d09c020c18f937b7bc305896495aa4ec767
TortoiseGitMerge: Accept more patch files

This patch enables TGitMerge to accept patches which are created using the *nix diff tool.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Git/GitPatch.cpp
src/Resources/TortoiseMergeENG.rc
src/TortoiseMerge/Patch.cpp
src/TortoiseMerge/Patch.h
src/TortoiseMerge/resource.h