Commit History

Auteur SHA1 Bericht Datum
  Jelmer Vernooij 026dc1ce36 Fix merge functionality to handle missing merge3 dependency gracefully 5 maanden geleden
  Jelmer Vernooij 242374e2a4 Fix typo in license preamble: "public" -> "published" 6 maanden geleden
  Jelmer Vernooij 71040559c2 Add basic support for merge drivers 6 maanden geleden