Fredrik Fornwall (fredrik at fornwall net)

Patch

r1599135

r1599135 | stefan2 | 2014-06-02 09:15:56 +0000 (Mon, 02 Jun 2014)

Include termios.h to get struct winsize declared when building with
the Android NDK.

* subversion/svn/file-merge.c: Include termios.h to fix Android build.

Patch by: Fredrik Fornwall (fredrik at fornwall net)