Merge branch 'gb/split-cmdline-errmsg' into next
commit41146fff12877df9ac420fc1ae32208af36d0dea
authorJunio C Hamano <gitster@pobox.com>
Sat, 14 Aug 2010 21:59:21 +0000 (14 14:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 14 Aug 2010 21:59:21 +0000 (14 14:59 -0700)
tree05b52a30b821133853ece27e9fb86e596dd6b9e7
parent1dea7b938eab2ac06e78cc3fb070c28dd30d5759
parentad9ac6db5d58de08d0497b9184e86926377c20dd
Merge branch 'gb/split-cmdline-errmsg' into next

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