diff options
author | Christian Couder <chriscool@tuxfamily.org> | 2010-03-31 21:22:07 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-04-01 11:14:10 -0700 |
commit | c674d0527396e4100454e8992ed7381ee29dd54e (patch) | |
tree | 2180d1998b7d49ce0fd721e36a2377f348d74c9e /xdiff-interface.c | |
parent | 3f9083cde3b434155c274168f166ffce2bb243e7 (diff) | |
download | git-c674d0527396e4100454e8992ed7381ee29dd54e.tar.gz |
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>
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions