diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-12-06 16:26:06 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-12-06 10:00:24 -0800 |
| commit | ba1f5f353775ddbf97bc0d543888783630693023 (patch) | |
| tree | 2b12778fc9f164fd3acbc3c5ccc95846096c741b /cache.h | |
| parent | xdl_merge(): fix and simplify conflict handling (diff) | |
| download | tgif-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 'cache.h')
0 files changed, 0 insertions, 0 deletions