Commit History

Author SHA1 Message Date
  Jelmer Vernooij 15c6faad0c Fix merge functionality to handle missing merge3 dependency gracefully 5 months ago
  Jelmer Vernooij 39f9d87583 Fix typo in license preamble: "public" -> "published" 6 months ago
  Jelmer Vernooij e921078335 Add basic support for merge drivers 6 months ago