kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
15,745 Commits
6 Branches
974 Tags
170 MiB
Commit Graph

1 Commits (2cb1f36d5098060a4bac182da16ceed3197a57c2)

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