1 commit

Author	SHA1	Message	Date
Nguyễn Thái Ngọc Duy	db699a8a1f	Move try_merge_command and checkout_fast_forward to libgit.a ... These functions are called in sequencer.c, which is part of libgit.a. This makes libgit.a potentially require builtin/merge.c for external git commands. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jeff King <peff@peff.net>	2012-10-29 03:08:30 -04:00