tests/test-merge3.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sun, 05 Aug 2007 23:04:56 -0300
changeset 5080 b304c2496f52
parent 1747 91c56c427171
permissions -rw-r--r--
dirstate: fix rebuild; add a test If rebuild calls invalidate, it will just queue a (re)read of the dirstate file, while what we really want is to empty the current state.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
     1
removing b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 775
diff changeset
     2
nothing changed