tests/test-merge3.out
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Sun, 31 Jan 2010 02:34:50 +0900
changeset 10303 35bcb3152e67
parent 1747 91c56c427171
permissions -rw-r--r--
i18n-ja: synchronized with e7727a545c48
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