Added show/hide merge commits tag
minor text change
Ensure that when showing revision graph, merge commits are always included
Merge branch 'pr/n1890_analyst74'

Conflicts:
	GitUI/UserControls/RevisionGrid.cs