| commit | e3bd21854a95b5f2aab329ebc860e4538e39c130 | |
| author | Frank Li <lznuaa@gmail.com> | |
| Fri, 28 May 2010 10:54:52 +0000 (28 18:54 +0800) | ||
| committer | Frank Li <lznuaa@gmail.com> | |
| Fri, 28 May 2010 10:54:52 +0000 (28 18:54 +0800) | ||
| tree | 4786b85185fc45cc4b37a8e16ef798e286285710 | treesnapshot (tar.gz zip) |
| parent | 643aa75cee087a67fc2975b4ee401ac8c8b11073 | commitdiff |
Fixed issue #446: TortoiseMerge crash when "Edit Conflicts"
Base file is not exist, OpenFile will not create file if path does not existed.
tempfile will move to original conflict file path.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Base file is not exist, OpenFile will not create file if path does not existed.
tempfile will move to original conflict file path.
Signed-off-by: Frank Li <lznuaa@gmail.com>
| src/TortoiseProc/AppUtils.cpp | diffblobblamehistory |