Hello, What am I doing wrong?
[EMAIL PROTECTED]:~/tree/conkeror$ git fetch remote: Counting objects: 86, done. remote: Compressing objects: 100% (56/56), done. Unpacking 66 objects remote: Total 66 (delta 48), reused 16 (delta 9) 100% (66/66) done * refs/heads/origin: fast forward to branch 'master' of git://repo.or.cz/conkeror old..new: 083d146..381a87f [EMAIL PROTECTED]:~/tree/conkeror$ git merge origin fatal: Needed a single revision Usage: /usr/bin/git-merge [-n] [--no-commit] [--squash] [-s <strategy>]... <merge-message> <head> <remote>+ This only happens on this one computer (Debian/Etch) - maybe git is too old to support that syntax on Debian/Etch? git pull works fine Thanks Brian May _______________________________________________ Conkeror mailing list [email protected] https://www.mozdev.org/mailman/listinfo/conkeror
