Fix handling of multiline ini files

Based on TortoiseSVN revision #25892.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Drop configdir parameter from docs

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Doc: Add a tip for how to use command line parameters from the msys environment

(fixes issue #2249)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Refactored: split CAppUtils::Merge()

Signed-off-by: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
Fixed partial issue 1608: Add "Retry" button where applicable for Merge

Signed-off-by: Yue Lin Ho <b8732003@student.nsysu.edu.tw>