merge support for use with in-memory packs.
authorJelmer Vernooij <jelmer@samba.org>
Fri, 12 Feb 2010 02:59:06 +0000 (03:59 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 12 Feb 2010 02:59:06 +0000 (03:59 +0100)
commit6196883bb2b6c9cfccc8b9a7c856d0fa76f93f45
treed420e9908aa95fc3dca2ad01c83a4860cada748c
parentfb1513b2f773f89bd11ed2baa3aff38248e22d51
parent17063a6f5f51af977e621e20a57ba40c1d93596c
merge support for use with in-memory packs.