Mercurial > public > mercurial-scm > hg

annotate tests/test-simplemerge-cmd.out @ 8383:dcfdcb51ac5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
inotify: make mask a class variable since it's instance-independant
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Fri, 08 May 2009 16:40:39 +0900
parents ea7b982b6c08
children e1f4343db740
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5081
ea7b982b6c08 Remove trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4364
diff changeset
1 (binary:application/octet-stream)