| Junio C Hamano | 525ab63 | 2007-12-24 00:36:00 -0800 | [diff] [blame] | 1 | /* |
| 2 | * Low level 3-way in-core file merge. |
| 3 | */ |
| 4 | |
| 5 | #ifndef LL_MERGE_H |
| 6 | #define LL_MERGE_H |
| 7 | |
| 8 | int ll_merge(mmbuffer_t *result_buf, |
| 9 | const char *path, |
| Jonathan Nieder | f01de62 | 2010-03-20 19:38:58 -0500 | [diff] [blame] | 10 | mmfile_t *ancestor, const char *ancestor_label, |
| Junio C Hamano | 525ab63 | 2007-12-24 00:36:00 -0800 | [diff] [blame] | 11 | mmfile_t *ours, const char *our_label, |
| 12 | mmfile_t *theirs, const char *their_label, |
| Avery Pennarun | 8cc5b29 | 2009-11-25 21:23:55 -0500 | [diff] [blame] | 13 | int flag); |
| Junio C Hamano | 525ab63 | 2007-12-24 00:36:00 -0800 | [diff] [blame] | 14 | |
| Junio C Hamano | 8588567 | 2010-01-16 23:28:46 -0800 | [diff] [blame] | 15 | int ll_merge_marker_size(const char *path); |
| 16 | |
| Junio C Hamano | 525ab63 | 2007-12-24 00:36:00 -0800 | [diff] [blame] | 17 | #endif |
