Any plans on supporting anything like SVN, Mercurial, …? Also I like the capabilities of the tool to show diffs - Would it be possible to support this for just any kind of files - even outside of a repo?
I’m also interested in this. Can smerge be used in conjunction with other tools like tortoisehg, so that in case of a merge conflict the resolution task is delegated to smerge?
I’m eager for this!!!
I’m looking for generic diff/merge tool with syntax highlighting for long, it is worth extra pay!
Today, I was able to combine the docs for command line and docs for Mercurial MergeToolConfiguration to create a configuration that’s working for me to use Sublime Merge as the merge tool for Mercurial. In my .hgrc:
[ui] merge = smerge [merge-tools] smerge.args = mergetool $base $local $other -o $output