OSDN Git Service

Fix 3way-diff algorithm that cannot detect conflict state correctly
authorsdottaka <none@none>
Sun, 19 Jan 2014 16:26:59 +0000 (01:26 +0900)
committersdottaka <none@none>
Sun, 19 Jan 2014 16:26:59 +0000 (01:26 +0900)
commitc412950493e4c4d5bff40047f728bf28f5c5fe34
tree8095ff73ff23e47de78fe63f3eade5a15104265f
parentc674f2fb19ac514c8182b162f1e151c46cf3603a
Fix 3way-diff algorithm that cannot detect conflict state correctly

--HG--
branch : stable
Src/Diff3.h
Src/DiffFileData.h
Src/DiffWrapper.cpp
Src/DiffWrapper.h
Src/FolderCmp.cpp
Src/stringdiffs.cpp