Added several new features to the Merge command, including the ability to specify a commit message (applicable only when a merge commit is created in a 3-way merge) and to force the merge mode into fast forward or 3-way only.  Also included unit testing for these features.
test exception with annotation
Merge branch 'adamlacoste-merge-upgrades' into develop