Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 4694:6bf58c9400e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial.el: ignore errors on hg-after-save-hook() Don't signal an error even if running hg command fails. Otherwise, succeeding hooks won't be called.
author NIIMI Satoshi <sa2c@sa2c.net>
date Tue, 22 May 2007 07:24:06 +0900
parents 91c56c427171
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
1 removing b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 775
diff changeset
2 nothing changed