Jiří Techet 6ef41c65a9 Various cleanups in the merge algorithm ...

Remove the continue statement and use if/else instead. Initialize the
val1 variable only with the value used for the chosen path (normal/fast).

2014-10-22 16:14:59 +02:00

..

ctags

JavaScript: fix handling of parentheses around an rvalue

2014-08-04 00:23:13 +02:00

mio

Support MSYS=1 to enable building with MSYS; use $/ instead of DIRSEP

2012-07-04 17:13:14 +01:00

src

Various cleanups in the merge algorithm

2014-10-22 16:14:59 +02:00

Makefile.am

Update makefile.win32 build system

2012-05-08 23:01:23 +02:00