annotate tests/test-merge2.out @ 2012:d07c322e0033

add missing filename title to gitweb's filelog page
author TK Soh <teekaysoh@yahoo.com>
date Tue, 28 Mar 2006 19:02:00 +0200
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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