On Nov 24, 2008 at 19:29, Henning Westerholt henning.westerholt@1und1.de wrote:
Module: sip-router Branch: master Commit: 8d41196809f014e00346785b6517bd2c4051901a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d411968...
Author: Henning Westerholt henning.westerholt@1und1.de Committer: Henning Westerholt henning.westerholt@1und1.de Date: Mon Nov 24 19:13:59 2008 +0100
Merge ssh://git.sip-router.org/sip-router into my_branch
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