tests/test-merge2.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sat, 04 Mar 2006 15:15:18 -0800
changeset 1914 a5bf0030df5f
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
make --style=compact look for map-cmdline.compact. change name of key in map file from changelog to changeset. rename command map files to start with map-cmdline. rename ui.logmap to ui.style in hgrc. now --style=foo does this: tries to open foo as file. tries as map-cmdline.foo in template path. tries as foo in template path.
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