tests/test-merge2.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sun, 12 Mar 2006 15:50:18 -0800
changeset 1918 7f0899f7828c
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
fix template tests.
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