Merge branch 'nd/builtin-to-libgit'
[git] / merge.c
2012-11-09  Jeff KingMerge branch 'nd/builtin-to-libgit'
2012-10-29  Nguyễn Thái Ngọc DuyMove try_merge_command and checkout_fast_forward to...