OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 770d457) | patch
Retry to fix the bug that was attempted to fix in rev.8261(Fix 3way-diff algorithm...
authorsdottaka <none@none>
Tue, 21 Jan 2014 14:58:27 +0000 (23:58 +0900)
committersdottaka <none@none>
Tue, 21 Jan 2014 14:58:27 +0000 (23:58 +0900)
commitad454ac94a1bc75a832a99af34c27fd3693dc648
tree71207e4de03f78eac989d3dd4f8d9eb5b05ba7b8tree | snapshot
parent770d4575591f61fa96a3061116db93e62afd92a7commit | diff
Retry to fix the bug that was attempted to fix in rev.8261(Fix 3way-diff algorithm that cannot detect conflict state correctly)

--HG--
branch : stable
Src/Diff3.h diff | blob | history
Src/DiffWrapper.cpp diff | blob | history
Src/stringdiffs.cpp diff | blob | history
About OSDN
Find Software
Develop Software
Help