Cumulative update of merge-recursive in C · git-mirror/git@3af244c · GitHub

Commit

Cumulative update of merge-recursive in C

Browse files

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>

Loading branch information

Johannes Schindelin authored and Junio C Hamano committed Jul 28, 2006

1 parent bf6d324 commit 3af244c