OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c097808) | patch
Fix: Change of codepage and EOL-style were not 3-way-merged. close #29
authorsdottaka <sdottaka@sourceforge.net>
Sun, 9 Feb 2014 01:42:55 +0000 (10:42 +0900)
committersdottaka <sdottaka@sourceforge.net>
Sun, 9 Feb 2014 01:42:55 +0000 (10:42 +0900)
commitcdd6c069422e6c73fe9e129302dcd1462c47f6d9
tree6b4dba7f36c008cfe611e7107947118c742ed8ebtree | snapshot
parentc0978086c51b6df61a878619cc38be972b57585acommit | diff
Fix: Change of codepage and EOL-style were not 3-way-merged. close #29

--HG--
branch : stable
Src/DiffTextBuffer.h diff | blob | history
Src/FileTextEncoding.h diff | blob | history
Src/Merge.rc diff | blob | history
Src/MergeDoc.cpp diff | blob | history
Src/resource.h diff | blob | history
About OSDN
Find Software
Develop Software
Help