Skip to main content

Browse the archive

Revision 456a4c08b8d8ddefda939014c15877ace3e3f499 authored by Junio C Hamano on 06 June 2011, 18:40:14 UTC, committed by Junio C Hamano on 06 June 2011, 18:40:14 UTC 
Merge branch 'jk/diff-not-so-quick'
 
* jk/diff-not-so-quick:
  diff: futureproof "stop feeding the backend early" logic
  diff_tree: disable QUICK optimization with diff filter

Conflicts:
	diff.c
2 parent s 6c92972 + 28b9264
Raw File
merge-file.h 
#ifndef MERGE_FILE_H
#define MERGE_FILE_H

extern void *merge_file(const char *path, struct blob *base, struct blob *our,
			struct blob *their, unsigned long *size);

#endif
back to top