Commit History

Author SHA1 Message Date
  Roberto Ostinelli 8fae20c8f0 Allow to set custom conflict resolution. 3 years ago