contrib / mw-to-git / git-remote-mediawiki.txton commit unpack-trees: fix "read-tree -u --reset A B" with conflicted index (b018ff6)
   1Git-Mediawiki is a project which aims the creation of a gate
   2between git and mediawiki, allowing git users to push and pull
   3objects from mediawiki just as one would do with a classic git
   4repository thanks to remote-helpers.
   5
   6For more information, visit the wiki at
   7https://github.com/Bibzball/Git-Mediawiki/wiki