repo.or.cz
/
alt-git.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
l10n: Inital Portuguese Portugal language (pt_PT)
[alt-git.git]
/
merge-file.h
blob
9b3b83ac6c262c313db8a85fd3f7e83564d94186
1
#ifndef MERGE_FILE_H
2
#define MERGE_FILE_H
3
4
extern
void
*
merge_file
(
const char
*
path
,
struct
blob
*
base
,
struct
blob
*
our
,
5
struct
blob
*
their
,
unsigned long
*
size
);
6
7
#endif