HACKING: we use "merge --log" even when merging master
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 10 Jan 2013 22:04:06 +0000 (23:04 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 10 Jan 2013 22:04:06 +0000 (23:04 +0100)
commit7138cc5eefae4ab5264cacfef5937a9ab235c238
treeb4cb7f08bdf5b9fb3bf66b8639d7c20e8bee3eec
parentad2e3170ac4d5fc407038ce07916b3d70f739b3a
HACKING: we use "merge --log" even when merging master

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
HACKING