tests/test-dirstatedirs.out
author Steve Borho <steve@borho.org>
Mon, 15 Feb 2010 21:18:16 -0600
branchstable
changeset 10486 6b354a763617
parent 7096 6dab29f6df37
permissions -rw-r--r--
mergetools: improve configuration for several merge tools * meld - provide labels for the three panes * diffmerge - add registry key for detection, improve arguments * beyond compare - add linux version * winmerge - improve arguments * araxis - add configuration, including registry key for detection * misc - provide default priorities for more tools
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7096
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     1
adding a/b/c/d/x
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     2
adding a/b/c/d/y
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     3
adding a/b/c/d/z
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     4
moving a/b/c/d/x to z/b/c/d/x
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     5
moving a/b/c/d/y to z/b/c/d/y
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     6
moving a/b/c/d/z to z/b/c/d/z