Mercurial > hg-stable
view tests/test-bdiff.py.out @ 24179:14d647d25c70
merge-tools: configuration for Beyond Compare on OS X
Based on the Linux configuration entry.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 27 Feb 2015 21:42:58 +0100 |
parents | eeac5e179243 |
children | 9a8363d23419 |
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' 6 6 'y\n\n' 6 6 'y\n\n' 9 9 'y\n\n' done done