##// END OF EJS Templates
Update win32 merge tools configuration...
Update win32 merge tools configuration Add WinMerge and Beyond Compare 3 to default merge tools configuration. Fix TortoiseMerge configuration.

File last commit:

r2248:b914f055 default
r7665:950484f0 default
Show More
test-diff-newlines
8 lines | 161 B | text/plain | TextLexer
#!/bin/sh
hg init
python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a
hg ci -Ama -d '1 0'
echo clean diff >> a
hg ci -mb -d '2 0'
hg diff -r0 -r1