Merge branch 'rr/fmt-merge-msg'
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:48:20 +0000 (13:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:48:20 +0000 (13:48 -0700)
commit02ef0ed...102a197e2b746f3e694c09915fa98060
tree3e703ac...28c01b7c964a0022185e14071cfb1c40copy hash to clipboard (tree)
parent2851e8e...a52e98d3112417952a24d82ae9d8c0ebcopy hash to clipboard (diff)
parentbd2549c...6b0b2d897e073bbaa34c1fee46acd8f0copy hash to clipboard (diff)
Documentation/merge-config.txt
builtin.h
builtin/fmt-merge-msg.c
builtin/merge.c