Honor the advanced setting "IncludeExternals" also when auto-updating after a failed commit.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk@25865 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
document the new tsvn:mergelogtemplatemsgtitlebottom property.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk@25866 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac