evolve: create new commit while resolving content-divergence Before this patch, we used to amend one of the content-divergent changes with the changes from the merge. Creating a new commit will certain advantages like letting user enter a commit message, showing user the new merge diff before commiting the content-divergent resolution and give us more control in the implementation part. The reason amend was used initially was just because it was easy. There are some tests update due to change.

     1

import sys

     2

     3

formatted_args = []

     4

     5

UNSAFE_CHARACTERS = [" ", "!", "\"", "#", "$", "&", "'", "(", ")", "*", ",", ";", "<", ">", "?", "[", "\\", "]", "^", "`", "{", "|", "}", ":", "~", "/"]

     6

     7

     8

def find_unsafe(arg):

     9

    for unsafe in UNSAFE_CHARACTERS:

    10

        if unsafe in arg:

    11

            return True

    12

    13

    return False

    14

    15

    16

for arg in sys.argv[1:]:

    17

    if find_unsafe(arg):

    18

        formatted_args.append('"%s"' % arg)

    19

    else:

    20

        formatted_args.append(arg)

    21

    22

print("$ " + " ".join(formatted_args))