| Junio C Hamano | 525ab63 | 2007-12-24 08:36:00 | [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 | |
| Jonathan Nieder | 712516b | 2010-08-26 05:49:53 | [diff] [blame] | 8 | struct ll_merge_options { |
| 9 | unsigned virtual_ancestor : 1; |
| 10 | unsigned variant : 2; /* favor ours, favor theirs, or union merge */ |
| 11 | unsigned renormalize : 1; |
| Justin Frankel | 58a1ece | 2010-08-26 05:50:45 | [diff] [blame] | 12 | long xdl_opts; |
| Jonathan Nieder | 712516b | 2010-08-26 05:49:53 | [diff] [blame] | 13 | }; |
| Jonathan Nieder | 73cf7f7 | 2010-08-05 11:17:38 | [diff] [blame] | 14 | |
| Junio C Hamano | 525ab63 | 2007-12-24 08:36:00 | [diff] [blame] | 15 | int ll_merge(mmbuffer_t *result_buf, |
| 16 | const char *path, |
| Jonathan Nieder | f01de62 | 2010-03-21 00:38:58 | [diff] [blame] | 17 | mmfile_t *ancestor, const char *ancestor_label, |
| Junio C Hamano | 525ab63 | 2007-12-24 08:36:00 | [diff] [blame] | 18 | mmfile_t *ours, const char *our_label, |
| 19 | mmfile_t *theirs, const char *their_label, |
| Jonathan Nieder | 712516b | 2010-08-26 05:49:53 | [diff] [blame] | 20 | const struct ll_merge_options *opts); |
| Junio C Hamano | 525ab63 | 2007-12-24 08:36:00 | [diff] [blame] | 21 | |
| Junio C Hamano | 8588567 | 2010-01-17 07:28:46 | [diff] [blame] | 22 | int ll_merge_marker_size(const char *path); |
| 23 | |
| Junio C Hamano | 525ab63 | 2007-12-24 08:36:00 | [diff] [blame] | 24 | #endif |
