Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-bdiff.out @ 754:3e73bf876f17
Fixes and cleanups to hgeditor:
- "HG: merge resolve" isn't supported for a long time now.
- detection of unchanged commit message if signing is turned off.
- don't add manifest hash to commit message if not signing.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 22 Jul 2005 07:30:52 +0100 |
parents | 8b067bde6679 |
children |
line wrap: on
line source
*** 'a\nc\n\n\n\n' 'a\nb\n\n\n' *** 'a\nb\nc\n' 'a\nc\n' *** '' '' *** 'a\nb\nc' 'a\nb\nc' *** 'a\nb\nc\nd\n' 'a\nd\n' *** 'a\nb\nc\nd\n' 'a\nc\ne\n' *** 'a\nb\nc\n' 'a\nc\n' *** 'a\n' 'c\na\nb\n' *** 'a\n' '' *** 'a\n' 'b\nc\n' *** 'a\n' 'c\na\n' *** '' 'adjfkjdjksdhfksj' *** '' 'ab' *** '' 'abc' *** 'a' 'a' *** 'ab' 'ab' *** 'abc' 'abc' *** 'a\n' 'a\n' *** 'a\nb' 'a\nb' done