48   $ git checkout -b other HEAD~ >/dev/null 2>/dev/null

    48   $ git checkout -b other HEAD~ >/dev/null 2>/dev/null

    49   $ echo c > a

    49   $ echo c > a

    50   $ echo a >> a

    50   $ echo a >> a

    51   $ commit -a -m t4.2

    51   $ commit -a -m t4.2

    52   $ git checkout master >/dev/null 2>/dev/null

    52   $ git checkout master >/dev/null 2>/dev/null

    54   $ commit -m 'Merge branch other'

    54   $ commit -m 'Merge branch other'

    55   $ cd ..

    55   $ cd ..

    56   $ hg convert --config extensions.progress= --config progress.assume-tty=1 \

    56   $ hg convert --config extensions.progress= --config progress.assume-tty=1 \

    57   >   --config progress.delay=0 --config progress.changedelay=0 \

    57   >   --config progress.delay=0 --config progress.changedelay=0 \

    58   >   --config progress.refresh=0 --config progress.width=60 \

    58   >   --config progress.refresh=0 --config progress.width=60 \

   135   $ git checkout -b Baz HEAD~ >/dev/null 2>/dev/null

   135   $ git checkout -b Baz HEAD~ >/dev/null 2>/dev/null

   136   $ echo baz > baz

   136   $ echo baz > baz

   137   $ git add baz

   137   $ git add baz

   138   $ commit -a -m 'add baz'

   138   $ commit -a -m 'add baz'

   139   $ git checkout master >/dev/null 2>/dev/null

   139   $ git checkout master >/dev/null 2>/dev/null

   141   $ commit -m 'Octopus merge'

   141   $ commit -m 'Octopus merge'

   142   $ echo bar >> bar

   142   $ echo bar >> bar

   143   $ commit -a -m 'change bar'

   143   $ commit -a -m 'change bar'

   144   $ git checkout -b Foo HEAD~ >/dev/null 2>/dev/null

   144   $ git checkout -b Foo HEAD~ >/dev/null 2>/dev/null

   145   $ echo >> foo

   145   $ echo >> foo

   146   $ commit -a -m 'change foo'

   146   $ commit -a -m 'change foo'

   147   $ git checkout master >/dev/null 2>/dev/null

   147   $ git checkout master >/dev/null 2>/dev/null

   149   $ commit -m 'Discard change to foo'

   149   $ commit -m 'Discard change to foo'

   150   $ cd ..

   150   $ cd ..

   151   $ glog()

   151   $ glog()

   152   > {

   152   > {

   153   >     hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@"

   153   >     hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@"