OSDN Git Service

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

Simple merge