git-merge-ours: make it a builtin.
Except that this fixes a longstanding corner case bug by tightening the way underlying diff-index command is run, it is functionally equivalent to the scripted version. Signed-off-by: NThomas Harning Jr <harningt@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
Showing
builtin-merge-ours.c
0 → 100644
想要评论请 注册 或 登录