1.7.2 Checking all powershell versions (pick first working one), detecting manual switch from a user, better handling of trucky batch characters Details: - fixing finding powershell (check for all versions and pick first one which is correct) in case the registry holds only powershell key, but is not valid powershell instance - Adding a simple manual_switch_detection variable to detect manual switch from user - make the launcher work better with tricky characters for cmd.exe (|, <, >, &)

     1

[automerge]

     2

# Automatically merge pulled changes from specified mercurial branch (if exists) 

     3

# to specified mercurial branch (if exists). The syntax is 

     4

# 

     5

# automerge = <from-branch>:<to branch>. 

     6

#

     7

# The example below will merge changed from branch `default` to branch `jv`. 

     8

# If merge fails, issue a warning but proceed. Optional. 

     9

#

    10

# automerge = default:jv

    11

automerge = default:jv