diff options
| author | Jacques Germishuys <jacquesg@striata.com> | 2014-04-07 20:15:45 +0200 |
|---|---|---|
| committer | Jacques Germishuys <jacquesg@striata.com> | 2014-04-14 16:16:21 +0200 |
| commit | 399f2b6294963b8a7a154ffd0103484d018c4e27 (patch) | |
| tree | a63dd0e0e78ba4a636959082e40beccb1a9af592 /src/merge.h | |
| parent | 553184a76245617556373af4cb5343e7fe58f41f (diff) | |
| download | libgit2-399f2b6294963b8a7a154ffd0103484d018c4e27.tar.gz | |
Introduce git_merge__extract_conflict_paths
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/merge.h b/src/merge.h index 2362da04d..00f6197bf 100644 --- a/src/merge.h +++ b/src/merge.h @@ -151,4 +151,6 @@ int git_merge__setup( int git_merge__indexes(git_repository *repo, git_index *index_new); +int git_merge__append_conflicts_to_merge_msg(git_repository *repo, git_index *index); + #endif |