Avoids having to run 'got update' for no good reason after 'got integrate'. The same change was made recently for both rebase and histedit in commit a615e0e7796ea1103a6e0d4b5dbb6134597886660 and we forgot about histedit.

And add a test case which verifies that the inverse also works, i.e. a symlink being replaced with a regular file. problem reported and fix tested by jrick

This test verifies the current behaviour, even though it is not the most desirable behaviour.

ok stsp

Previous default output remains when test cases are run individually. ok tracey