tests/test-merge2.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 29 Mar 2006 22:58:34 +0200
changeset 2022 a59da8cc35e4
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
New option -i/--ignored for 'hg status' to show ignored files. localrepo.changes() now returns an additional list of ignored files if it is called with show_ignored=True.
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
adding b
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
     2
adding b