tests/test-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 13 Mar 2006 08:56:59 +0100
changeset 1922 6d50d6189269
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
ui: output the number of file updated/merged/removed/... on update add a note for people to remember commiting after a merge.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines: