Commit History

Author SHA1 Message Date
  Jelmer Vernooij b1c650fc8c Cope with missing merge3 2 months ago
  Jelmer Vernooij 5c5095b375 Add basic merge command 2 months ago
  Jelmer Vernooij 52e28288f6 Support merging trees 2 months ago