![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Christian Couder <chriscool@tuxfamily.org> | |
| Wed, 31 Mar 2010 19:22:07 +0000 (21:22 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 1 Apr 2010 18:14:10 +0000 (11:14 -0700) | ||
| commit | c674d0527396e4100454e8992ed7381ee29dd54e | |
| tree | 2180d1998b7d49ce0fd721e36a2377f348d74c9e | tree | snapshot |
| parent | 3f9083cde3b434155c274168f166ffce2bb243e7 | commit | diff |
merge: make function try_merge_command non static
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diff | blob | history | |
| merge-recursive.h | diff | blob | history |