Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge7.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 | bf6c91cb816f |
children | 6d50d6189269 |
comparison
equal
deleted
inserted
replaced
1759:5afd459db177 | 1770:4eea6a747c27 |
---|