changed resume option to string and fixed tests

* changed resume option to string instead of boolean so that new
command is git integrate —resume my-feature-branch
* removed comments