mj.ucw.cz Git - libucw.git/commit

]> mj.ucw.cz Git - libucw.git/commit

projects / libucw.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 2c23151) | patch

author	Martin Mares <mj@ucw.cz>
	Wed, 29 Aug 2007 13:25:36 +0000 (15:25 +0200)
committer	Martin Mares <mj@ucw.cz>
	Wed, 29 Aug 2007 13:25:36 +0000 (15:25 +0200)
commit	fe6dc0daa9980627429b4ece23a51f971dd9698a
tree	ce69389e75ccc838e82498eef35f86068b2c1b3e	tree \| snapshot
parent	2c231515ea791d45d206dacfe0268341bb7fdfd0	commit \| diff

Multi-way merges work fine in simple cases.
I am going to give them a try on large data to see if they are viable.

lib/sorter/common.h		diff \| blob \| history
lib/sorter/govern.c		diff \| blob \| history
lib/sorter/s-multiway.h		diff \| blob \| history
lib/sorter/sorter.h		diff \| blob \| history

UCW libraries