On the invoke-diff-merge-feature branch: Update BRANCH-README.invoke-diff-merge-featureinvoke-diff-merge-feature
tree66805fb01c23c86ae75e25c555188a3e4930c32e
-rw-r--r-- 3095 .ycm_extra_conf.py
-rw-r--r-- 24054 BRANCH-README
-rw-r--r-- 94 BUGS
-rw-r--r-- 244203 CHANGES
-rw-r--r-- 13841 COMMITTERS
-rw-r--r-- 63010 INSTALL
-rw-r--r-- 14498 LICENSE
-rw-r--r-- 38112 Makefile.in
-rw-r--r-- 917 NOTICE
-rw-r--r-- 2254 README
-rw-r--r-- 2032 aclocal.m4
-rwxr-xr-x 6435 autogen.sh
-rw-r--r-- 45486 build.conf
drwxr-xr-x - build
-rw-r--r-- 54592 configure.ac
drwxr-xr-x - contrib
drwxr-xr-x - doc
-rwxr-xr-x 11327 gen-make.py
-rwxr-xr-x 4809 get-deps.sh
drwxr-xr-x - notes
drwxr-xr-x - subversion
drwxr-xr-x - tools
-rw-r--r-- 32922 win-tests.py