Fixed #575 (issue with merge-base always returning the current head commit)
Merge pull request #576 from volaya/merge_base_fix

Fix for merge-base command