repo.or.cz
/
git
/
gitster.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 'es/worktree-repair-copied' into cw/worktrees-relative
[git/gitster.git]
/
merge-blobs.h
blob
13cf9669e5b2c43b34bbecd2ea71bf14d9a36d65
1
#ifndef MERGE_BLOBS_H
2
#define MERGE_BLOBS_H
3
4
struct
blob
;
5
struct
index_state
;
6
7
void
*
merge_blobs
(
struct
index_state
*,
const char
*,
8
struct
blob
*,
struct
blob
*,
9
struct
blob
*,
unsigned long
*);
10
11
#endif
/* MERGE_BLOBS_H */