merge: Make 'merge.log' an integer or boolean option
authorRamkumar Ramachandra <artagnon@gmail.com>
Wed, 8 Sep 2010 17:59:55 +0000 (23:29 +0530)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Sep 2010 18:39:23 +0000 (11:39 -0700)
commitbda3b8f...1735aecfb5265ed781548eab238d7a14
tree726a983...0f5862a9a4974271cae1e609bb1048f9copy hash to clipboard (tree)
parent96e9420...d357728949571b42eb0249881ae3a78ecopy hash to clipboard (diff)
Documentation/git-fmt-merge-msg.txt
Documentation/merge-config.txt
builtin/fmt-merge-msg.c
builtin/merge.c