repo.or.cz
/
git
/
raj.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
Merge branch 'jk/untracked-cache-more-fixes'
[git/raj.git]
/
merge-blobs.h
blob
cc31038b807fbee073a063ec83fe298c87fd2b3d
1
#ifndef MERGE_BLOBS_H
2
#define MERGE_BLOBS_H
3
4
struct
blob
;
5
struct
index_state
;
6
7
extern
void
*
merge_blobs
(
struct
index_state
*,
const char
*,
8
struct
blob
*,
struct
blob
*,
9
struct
blob
*,
unsigned long
*);
10
11
#endif
/* MERGE_BLOBS_H */