K 10
svn:author
V 8
rdivacky
K 8
svn:date
V 27
2010-05-29T13:05:41.419678Z
K 7
svn:log
V 176
Fix the mergemaster problem properly by changing the condition
so it never evaluates to false thus the target does not fail.

Submitted by: Dimitry Andric <dimitry andric com>

END