Merge branch 'gb/split-cmdline-errmsg'
commitb95d0a2f8cb2923fed417e649a66c7372b968248
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:28:55 +0000 (21 23:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:28:55 +0000 (21 23:28 -0700)
treedfeb2f5f2e8c756d34cece809ff0f7ef428c9fda
parentdfdb1e4150fb9c9ee86186e89987dc565bc91ead
parentad9ac6db5d58de08d0497b9184e86926377c20dd
Merge branch 'gb/split-cmdline-errmsg'

* gb/split-cmdline-errmsg:
  split_cmdline: Allow caller to access error string
builtin/merge.c
cache.h
git.c