Merged in jdunne525/winmerge-v2 (pull request #1)

More on Issue #73 Fixed the -dl -dm and -dr description parameters for conflict files (for both 2 way and 3 way conflict files).

Approved-by: Takashi Sawanaka <sdottaka@users.sourceforge.net>

diff --cc Src/MainFrm.cpp
Simple merge

diff --cc Src/Merge.cpp
Simple merge