Skip to main content

Browse the archive

Revision 6ea938542610f4c7b978a2d8bac00fade72ce9f1 authored by Junio C Hamano on 04 January 2012, 17:43:26 UTC, committed by Junio C Hamano on 04 January 2012, 17:43:26 UTC 
Merge branch 'nd/maint-parse-depth' into maint
 
* nd/maint-parse-depth:
  Catch invalid --depth option passed to clone or fetch
2 parent s bc0fe84 + e7622ce
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