Hudson Oliveira

Handle conflicts with origin other than merge

4

The extension handles correctly conflicts coming from the merge and shelve/unshelve commands: * merge ``` hg init echo a > newfile hg add newfile hg commit -m 1 echo b...

 It would be nice if the first line of the description was also shown.

There is no way to abort a merge via the extension.

Enable testing in MacOS via Github Actions

1

https://github.com/mrcrowl/vscode-hg/commit/9fef761739d72a85b4545f9925c90e788cd44600 implemented testing for Windows and Ubuntu via Github Actions. However, for [GitHub's MacOS image does not come with Mercurial installed](https://github.com/actions/virtual-environments/blob/master/images/macos/macos-10.15-Readme.md), so we cannot run tests on it the same...

This is a minor issue, but I'm filing this for the sake of documenting. 

Today, when a push operation does nothing, we do not inform the user. This enhancement is for displaying an info message saying the push did not push anything. Mercurial prints...

When a symlink is modified to point to something else, the diff view for the current state of the file shows the contents of the file, instead of showing simply...

Enhancement: Allow user to specify username instead of error "Hg: no username supplied"

3

When doing the first commit, if the username is not specified, we issue an error:  We could prompt the user to enter a username instead.