Commit History

Author SHA1 Message Date
  Roberto Ostinelli 315a29a1c6 Allow to set netsplit conflicting mode. 10 years ago
  Roberto Ostinelli e7a71c40c4 Add test to ensure conflicts are resolved by default. 10 years ago
  Roberto Ostinelli 382d08423f Add automerge after net splits. 10 years ago