Commit History

Autor SHA1 Mensaxe Data
  Jelmer Vernooij b1c650fc8c Cope with missing merge3 hai 1 mes
  Jelmer Vernooij 5c5095b375 Add basic merge command hai 1 mes
  Jelmer Vernooij 52e28288f6 Support merging trees hai 1 mes