Cumulative update of merge-recursive in C

Browse Source

This contains mainly three sorts of fixes:

- get rid of small wrapper functions
- reuse the diff_filespec structure when sha1, mode & path are needed
- Junio's pedantic updates

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

...

This commit is contained in:

Johannes Schindelin 2006-07-27 13:17:07 +02:00 committed by Junio C Hamano

parent bf6d324e73

commit 3af244caa8

1 changed files with 366 additions and 528 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

894

merge-recursive.c

View File

File diff suppressed because it is too large Load Diff