Open timkuijsten opened 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.
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.