Readme fix (#8)

* Fix readme text

* merge tooling fix

Author: sarum90

README.md

@@ -18,4 +18,4 @@ The steam of JsonTokens emitted by this crate unfortunately cannot quite
 provide the Iter interface. The reason is: the emitted JsonTokens refer to an
 internal buffer of the stream, and thus maintain a reference to the stream.
 
-Also, the iterator returns Results, to enable reporting of IO or JSON encoding errors.
+The iterator returns Results, to enable reporting of IO or JSON encoding errors.

tools/merge.sh

@@ -21,14 +21,15 @@ if [[ -n $(git status -su) ]]; then
   exit -1
 fi
 
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
+
 git fetch
-if [[ $(git rev-parse HEAD) != $(git rev-parse @{u}) ]]; then
+if [[ $(git rev-parse HEAD) != $(git rev-parse @{u}) && $(git rev-parse HEAD) != $(git rev-parse origin/${BRANCH}) ]]; then
   error 'Current branch diverged from origin, aborting merge request.'
   git status
   exit -1
 fi
 
-BRANCH=$(git rev-parse --abbrev-ref HEAD)
 if [[ ${BRANCH} == "master" ]]; then
   error 'Refusing to attempt to merge master into master.'
   exit -1