Merge branch 'gb/split-cmdline-errmsg'

* gb/split-cmdline-errmsg:
split_cmdline: Allow caller to access error string

diff --cc builtin/merge.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc git.c
Simple merge