1 When building with the Android NDK, termios.h is needed to get struct winsize defined.
3 Has been accepted upstream, http://svn.haxx.se/dev/archive-2014-06/0007.shtml
5 diff -u -r ../subversion-1.8.5/subversion/svn/file-merge.c ./subversion/svn/file-merge.c
6 --- ../subversion-1.8.5/subversion/svn/file-merge.c 2013-07-09 06:00:06.000000000 +0200
7 +++ ./subversion/svn/file-merge.c 2014-02-12 09:05:48.000000000 +0100
14 /* Baton for functions in this file which implement svn_diff_output_fns_t. */
15 struct file_merge_baton {