OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d140b37) | patch
PATCH: [ 1875129 ] Resolve conflict files
authorKimmo Varis <kimmov@gmail.com>
Tue, 22 Jan 2008 17:26:13 +0000 (17:26 +0000)
committerKimmo Varis <kimmov@gmail.com>
Tue, 22 Jan 2008 17:26:13 +0000 (17:26 +0000)
commit03483516a9c8e998b92718b7bcfeb41133608d42
treea73bcd27b2ba92c8e4364d52e5482ff5f44fae59tree | snapshot
parentd140b37ed2542dac17a43d6fe7db929b2f482684commit | diff
PATCH: [ 1875129 ] Resolve conflict files
 Use string constants in code for conflict markers to not confuse parser when parsing this file.
Src/ConflictFileParser.cpp diff | blob | history
About OSDN
Find Software
Develop Software
Help