projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 98e6da8) | patch
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)
commitba1f5f353775ddbf97bc0d543888783630693023
tree2b12778fc9f164fd3acbc3c5ccc95846096c741btree | snapshot
parent98e6da8a360b77af2924e8056fd951013835699bcommit | diff
Add builtin merge-file, a minimal replacement for RCS merge

merge-file has the same syntax as RCS merge, but supports only the
"-L" option.

For good measure, a test is added, which is quite minimal, though.

[jc: further fix for compliation errors included.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Makefile diff | blob | history
builtin-merge-file.c [new file with mode: 0644] blob
builtin.h diff | blob | history
git.c diff | blob | history
t/t6023-merge-file.sh [new file with mode: 0644] blob
Git—the stupid content tracker