debian / compaton commit Use git-merge in git-pull (second try). (60fb5b2)
   14