Amend gitmerge to recognize the injunction "don't merge".master
treeff002615e157e4148c054c63fa5857f8305e30fe
-rw-r--r-- 585 .dir-locals.el
-rw-r--r-- 2834 .gitattributes
-rw-r--r-- 4870 .gitignore
-rw-r--r-- 932 BUGS
-rw-r--r-- 15543 CONTRIBUTE
-rw-r--r-- 35147 COPYING
-rw-r--r-- 479031 ChangeLog.1
-rw-r--r-- 1307105 ChangeLog.2
-rw-r--r-- 804029 ChangeLog.3
-rw-r--r-- 2934 GNUmakefile
-rw-r--r-- 31414 INSTALL
-rw-r--r-- 3365 INSTALL.REPO
-rw-r--r-- 44247 Makefile.in
-rw-r--r-- 5650 README
drwxr-xr-x - admin
-rwxr-xr-x 9666 autogen.sh
drwxr-xr-x - build-aux
-rw-r--r-- 14577 config.bat
-rw-r--r-- 186315 configure.ac
drwxr-xr-x - doc
drwxr-xr-x - etc
drwxr-xr-x - leim
drwxr-xr-x - lib-src
drwxr-xr-x - lib
drwxr-xr-x - lisp
drwxr-xr-x - lwlib
drwxr-xr-x - m4
-rwxr-xr-x 19174 make-dist
drwxr-xr-x - modules
drwxr-xr-x - msdos
drwxr-xr-x - nextstep
drwxr-xr-x - nt
drwxr-xr-x - oldXMenu
drwxr-xr-x - src
drwxr-xr-x - test