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

diff --cc git-compat-util.h
Simple merge