tests/test-simplemerge-cmd.out
author Bryan O'Sullivan <bos@serpentine.com>
Thu, 06 Sep 2007 10:52:54 -0700
changeset 5285 3ef190234b55
parent 5115 ea7b982b6c08
permissions -rw-r--r--
record: change wording of initial per-file prompt
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5115
ea7b982b6c08 Remove trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4360
diff changeset
     1
(binary:application/octet-stream)