Skip to main content

Browse the archive

Revision b63103e908af54e5e2eaa3faad350e4738ef0047 authored by Junio C Hamano on 17 January 2012, 00:45:56 UTC, committed by Junio C Hamano on 17 January 2012, 00:45:56 UTC 
Merge branch 'jn/maint-gitweb-grep-fix'
 
* jn/maint-gitweb-grep-fix:
  gitweb: Harden "grep" search against filenames with ':'
  gitweb: Fix file links in "grep" search
2 parent s 6db5c6e + 8e09fd1
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