aboutsummaryrefslogtreecommitdiff
path: root/git.spec.in
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-12-06 16:26:06 +0100
committerJunio C Hamano <junkio@cox.net>2006-12-06 10:00:24 -0800
commitba1f5f353775ddbf97bc0d543888783630693023 (patch)
tree2b12778fc9f164fd3acbc3c5ccc95846096c741b /git.spec.in
parent98e6da8a360b77af2924e8056fd951013835699b (diff)
downloadgit-ba1f5f353775ddbf97bc0d543888783630693023.tar.gz
git-ba1f5f353775ddbf97bc0d543888783630693023.tar.xz
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>
Diffstat (limited to 'git.spec.in')
0 files changed, 0 insertions, 0 deletions