tests/test-merge3.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 09 Jun 2007 01:04:28 -0300
changeset 4530 0ac7fee4f024
parent 1747 91c56c427171
permissions -rw-r--r--
Make sure the changelog mentions files whose flags changed These changes don't actually need a new filelog entry (see next patch), but if we don't mention the files in the changelog, it becomes much harder to find all changesets that touch a file (not even a "hg log --removed file" will work).
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