diff -r 78a25071ed88 -r 3dffe58a573f docs/src/header.html --- a/docs/src/header.html Wed Apr 10 13:48:44 2019 +0200 +++ b/docs/src/header.html Wed Apr 10 13:50:24 2019 +0200 @@ -42,6 +42,7 @@
  • pull
  • push
  • archive
  • +
  • list-conflicts
  • resolve-conflicts
  • delete-conflicts
  • trash-info