Browse Source

Cumulative update of merge-recursive in C

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>

maint

Johannes Schindelin 19 years ago committed by Junio C Hamano

parent

bf6d324e73

commit

3af244caa8

1 changed files with 364 additions and 526 deletions

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

1. 890
     merge-recursive.c

890

merge-recursive.c

View File

File diff suppressed because it is too large Load Diff

Write Preview

Loading…

Cancel

Save