tests/test-simplemerge-cmd.out
author Matt Mackall <mpm@selenic.com>
Tue, 03 Jun 2008 15:41:09 -0500
changeset 6646 9eb274d773d9
parent 5081 ea7b982b6c08
child 8446 e1f4343db740
permissions -rw-r--r--
copies: teach copies about dirstate.copies When we're using copies() to find changes between the working directory and its first parent for diff/status/etc., use dirstate.copies() directly. This avoids doing a full statwalk for simple diffs (issue1090) and removes a special case from the status command.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5081
ea7b982b6c08 Remove trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4364
diff changeset
     1
(binary:application/octet-stream)