Skip to main content

Browse the archive

Revision 284daf29026c519729747bd2051829f0f958473c authored by Junio C Hamano on 25 August 2011, 23:00:53 UTC, committed by Junio C Hamano on 25 August 2011, 23:00:53 UTC 
Merge branch 'jc/merge-reword'
 
* jc/merge-reword:
  merge: reword the final message
2 parent s b0578c9 + f23101b
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