_merge via _ensureLocalPerspective should diff the merge item itself as well

Netsend / mastersync

multi-master replication

GNU Affero General Public License v3.0

0 stars 1 forks source link

Open timkuijsten opened 9 years ago

timkuijsten commented 9 years ago

if a merge is recreated (because of a merge received by a remote), only the parents are merged, but any changes in the merge itself are ignored.