Sync with 1.7.10.3
commit4f64464023d0bf7ce065f1dccaf267ca38b3521f
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 May 2012 18:36:25 +0000 (25 11:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 May 2012 18:36:25 +0000 (25 11:36 -0700)
tree0a4e42e08c200ab448c9879528e7662e1b8c52ce
parent5bc2dc29d482448f2bdc0e9bbcb6e2d8a89d9c6a
parent26e5c5d09334d157bd04f794f16f6e338d50c752
Sync with 1.7.10.3
builtin/fmt-merge-msg.c