tests/test-merge3.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 07 Sep 2006 14:12:39 +0200
changeset 3063 035fd2029575
parent 1747 91c56c427171
permissions -rw-r--r--
git --diff: fix traceback when getting mode change - use the manifest instead of the mode in the working dir if the diff is against two revisions - add a testcase
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