1 Commits (d44e71261f91d3cc81293e0976bb40daa8abb583)

Author	SHA1	Message	Date
Thomas Harning	a00a42ae33	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: Thomas Harning Jr <harningt@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2007-11-22 14:21:59 -08:00