tests/test-merge2.out
author Bryan O'Sullivan <bos@serpentine.com>
Thu, 22 Sep 2005 23:19:47 -0700
changeset 1321 b47f96a178a3
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
Clean up date and timezone handling. We used to pass changelog dates around as a "unixtime timezone" string containing a pair of encoded ints. Now, they get passed around as a (unixtime, timezone) tuple of numbers, which makes much more sense.
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