r11832: - some updates for the conflict resolving logic
authorStefan Metzmacher <metze@samba.org>
Mon, 21 Nov 2005 14:21:56 +0000 (14:21 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:46:36 +0000 (13:46 -0500)
commit35ab665957a0114e749e4045abdc2fb482867711
treefb7f58df45aff03c12baea42982303bafb76117c
parentbe622259ab1976abb800f55d5d8d329359e082db
r11832: - some updates for the conflict resolving logic
- use better function names

metze
source/wrepl_server/wrepl_apply_records.c