3_way_merge
No One
Actions

Authored By

	bapt
	Oct 2 2014, 5:48 PM

Size

429 B

Referenced Files

None

Subscribers

None

3_way_merge
View Options

	char buf[] = "test\ntest1";
	char buf1[] = "test\n#test1";
	char buf2[] = "test\ntest1\ntest2";

	struct sbuf *b = sbuf_new_auto();
	merge_3way(buf, buf1, buf2, b);

	sbuf_finish(b);
	printf("Vanilla:\n---\n%s\n---\n", buf);
	printf("Modified:\n---\n%s\n---\n", buf1);
	printf("New:\n---\n%s\n---\n", buf2);
	printf("Result:\n---\n%s\n---\n", sbuf_data(b));

File Metadata

Mime Type: text/plain; charset=utf-8
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 31687
Default Alt Text: 3_way_merge (429 B)

Event Timeline