https://github.com/git/git
Revision 8516c1c231272e3c8fb42ba34306c776e6a90409 authored by Junio C Hamano on 16 August 2011, 18:41:27 UTC, committed by Junio C Hamano on 16 August 2011, 18:41:27 UTC
* ms/help-unknown:
  help_unknown_cmd: do not propose an "unknown" cmd
2 parent s 412403e + 823e0de
Raw File
Tip revision: 8516c1c231272e3c8fb42ba34306c776e6a90409 authored by Junio C Hamano on 16 August 2011, 18:41:27 UTC
Merge branch 'ms/help-unknown' into maint
Tip revision: 8516c1c
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