Skip to main content

Browse the archive

Revision 4802997c7531835f16b6fce690854d9a75119d0b authored by Junio C Hamano on 06 February 2012, 07:58:42 UTC, committed by Junio C Hamano on 06 February 2012, 07:58:42 UTC 
Merge branch 'cb/push-quiet' into maint
 
* cb/push-quiet:
  t5541: avoid TAP test miscounting
  fix push --quiet: add 'quiet' capability to receive-pack
  server_supports(): parse feature list more carefully
2 parent s 1c719ff + d336572
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