Re: [SR-Dev] git:master: Merge ssh://git.sip-router.org/sip-router into my_branch

On Nov 24, 2008 at 19:29, Henning Westerholt <henning.westerholt(a)1und1.de> wrote: That should have been: Merge commit 'origin/henning/trie' into master * commit 'origin/henning/trie': add trie to library directory add SHM_MEM_ERROR and PKG_MEM_ERROR logging macros to mem.h Henning did you forgot to set merge log to true in your git config (~/.gitconfig or per repository in .git/config)? ( git config --get merge.log # to see it's value git config --global merge.log true # to set it to true) Andrei