vim start page
vertical 3-way merge in fugitive
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  vertical 3-way merge in fugitive
  vim start page

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.