Merge, Pull and Rebase now don't use diff to synchronize file system with IRIS

[isc-hwojnick]

Merge, Pull and Rebase will now use the output of the command itself to drive their synchronization with IRIS.

ex:
the merge command will output:

Merge made by the 'ort' strategy.
cls/package/newb4.cls | 5 -----
cls/package/newb5.cls | 5 -----
cls/package/newb7.cls | 5 +++++
3 files changed, 5 insertions(+), 10 deletions(-)
delete mode 100644 cls/package/newb4.cls
delete mode 100644 cls/package/newb5.cls
create mode 100644 cls/package/newb7.cls

In this example, the last 3 lines of the output are used to sync iris with the filesystem

[isc-pbarton]

Merge and checkout of local and remote branches are working great for me.
Pull is having the issue from before where deletes/adds on the local branch get undone - but that is preexisting behavior for as long as the pull function has been there. We could create a new issue to address that later by using the same logic as merge and checkout.
The preview pull on pull.csp is broken again and doesn't display any output. That should be fixed, I think by printing the output streams after preview in %zpkg.isc.sc.git.Socket

[isc-hwojnick]

Merge and checkout of local and remote branches are working great for me. Pull is having the issue from before where deletes/adds on the local branch get undone - but that is preexisting behavior for as long as the pull function has been there. We could create a new issue to address that later by using the same logic as merge and checkout. The preview pull on pull.csp is broken again and doesn't display any output. That should be fixed, I think by printing the output streams after preview in %zpkg.isc.sc.git.Socket

@isc-pbarton I think I should just throw pull in with merge and rebase in this git issue and rename it. What do you think?

[isc-hwojnick]

As for the previewing, I think I can fix that