Using terminal fugitive as merge tool
Fixed completion to allow full cycling