commands: wrapped docstrings at 78 characters We have always had a left margin of 4 characters -- probably just because that's how docstrings for top-level functions turn out by default, but it also looks nice in the built-in help. The docstrings were wrapped at 70 characters, which is the default for Emacs. However, this gives a right margin of 10 characters in a standard 80 character terminal. I've now wrapped the relevant docstrings at 78 characters, effectively killing the right margin. The asymmetric margins looked a bit odd and some of the text looked cramped with a right margin, so Dirkjan and I felt that it was best to remove it entirely. The two character gap was kept to have some space between the border of the terminal -- it will also make diffs involving the docstrings fit in a 80 character line.

     1

#!/bin/sh

     2

     3

# In the merge below, the file "foo" has the same contents in both

     4

# parents, but if we look at the file-level history, we'll notice that

     5

# the version in p1 is an ancestor of the version in p2.  This test

     6

# makes sure that we'll use the version from p2 in the manifest of the

     7

# merge revision.

     8

     9

hg init repo

    10

cd repo

    11

    12

echo foo > foo

    13

hg ci -qAm 'add foo'

    14

    15

echo bar >> foo

    16

hg ci -m 'change foo'

    17

    18

hg backout -r tip -m 'backout changed foo'

    19

    20

hg up -C 0

    21

touch bar

    22

hg ci -qAm 'add bar'

    23

    24

hg merge --debug

    25

hg debugstate | grep foo

    26

hg st -A foo

    27

hg ci -m 'merge'

    28

    29

hg manifest --debug | grep foo

    30

hg debugindex .hg/store/data/foo.i

    31