Merge branch 'jk/common-main'
commitb8171981fdea62f1f4c44f6d26f65b6324b31263
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Oct 2016 20:15:23 +0000 (31 13:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Oct 2016 20:15:23 +0000 (31 13:15 -0700)
tree8ec7ed5b0d4840cb343c1b79d48d3f47adaa7afb
parent9fa1f902bf8eaaa2a1d78cd7603d28a33d46e30c
parent5c238e29a85dd109e42513c6a9d09008d8839bae
Merge branch 'jk/common-main'

A trivial clean-up to a recently graduated topic.

* jk/common-main:
  git-compat-util: move content inside ifdef/endif guards
git-compat-util.h