Add builtin merge-file, a minimal replacement for RCS merge
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Wed, 6 Dec 2006 15:26:06 +0000 (16:26 +0100)
committerJunio C Hamano <junkio@cox.net>
Wed, 6 Dec 2006 18:00:24 +0000 (10:00 -0800)
commitba1f5f3...3775ddbf97bc0d543888783630693023
tree2b12778...c9f164fd3acbc3c5ccc95846096c741bcopy hash to clipboard (tree)
parent98e6da8...360b77af2924e8056fd951013835699bcopy hash to clipboard (diff)
Makefile
builtin-merge-file.c [new file with mode: 0644]
builtin.h
git.c
t/t6023-merge-file.sh [new file with mode: 0644]