tests/test-merge2.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sat, 04 Mar 2006 12:40:10 -0800
changeset 1913 74cf2b2f43d4
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
fix some things people wanted to be cleaner. rename --map-file to --style. no more -t alias for --template. update docs. rename template entry in map files to changelog. if --verbose, use changelog_verbose if there, else changelog.
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