git-jump should now work better with merges.
Minor comment tweak