OSDN Git Service

PATCH: [ 1880423 ] Check if file is a conflict file before parsing
authorKimmo Varis <kimmov@gmail.com>
Sun, 27 Jan 2008 11:50:51 +0000 (11:50 +0000)
committerKimmo Varis <kimmov@gmail.com>
Sun, 27 Jan 2008 11:50:51 +0000 (11:50 +0000)
commit594de8d8ccba245998230ac69aa5b2987dfe472c
tree7c4386712d52c009fad851f510600fa6de6b6c17
parente8e9cdc2a022da3d9857e135b27a17c4a24c4b42
PATCH: [ 1880423 ] Check if file is a conflict file before parsing
Docs/Users/ChangeLog.txt
Src/ConflictFileParser.cpp
Src/ConflictFileParser.h
Src/Languages/English.pot
Src/MainFrm.cpp
Src/Merge.cpp
Src/Merge.rc
Src/resource.h