https://github.com/git/git
Revision eca4f3b1af1d4ffe27aba65b1abb24df487eaf38 authored by Junio C Hamano on 06 June 2011, 18:40:18 UTC, committed by Junio C Hamano on 06 June 2011, 18:40:18 UTC
* jn/gitweb-docs:
  gitweb: Move "Requirements" up in gitweb/INSTALL
  gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL
  gitweb: Move information about installation from README to INSTALL
2 parent s 456a4c0 + 80b4dfe
Raw File
Tip revision: eca4f3b1af1d4ffe27aba65b1abb24df487eaf38 authored by Junio C Hamano on 06 June 2011, 18:40:18 UTC
Merge branch 'jn/gitweb-docs'
Tip revision: eca4f3b
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