Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-static-http.out @ 1770:4eea6a747c27
hgmerge: fix diff+patch detection; cleanups
Details:
- actually show help message when no tools are found
- whitespace cleanup (stupid emacs)
- quote more variables
- simplify merge/diff3 error handling
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Tue, 21 Feb 2006 15:48:09 -0600 |
parents | e89033eb90a5 |
children | 0b3f4be5c5bf 7d83a351a936 |