bug#8321: 23.1; emerge error diff extra operand

["Mark H. David" <mhd@yv.org>]

Please write in English if possible, because the Emacs maintainers
usually do not have translators to read other languages for them.

Your bug report will be posted to the bug-gnu-emacs@gnu.org mailing list,
and to the gnu.emacs.bug news group.

Please describe exactly what actions triggered the bug
and the precise symptoms of the bug:

M-x emerge-files [RET] file1 [RET] file2 [RET]

produces a buffer with name *emerge-diff-errors* whose contents is as
follows:

diff: extra operand
diff: Try `diff --help' for more information.


At the bottom of the window, in the minibuffer, the following text
appears:

Errors found in diff/diff3 output. Merge buffer is *merge*.


Normally, I'd be put right into the merge buffer (typically named
*merge* or some variant).  If I go to that buffer manually, the
merge/diff seems to have failed. E.g., even though the files are quite
different, typing 'n' for the command to go to the next difference,
does nothing.

If Emacs crashed, and you have the Emacs process in the gdb debugger,
please include the output from the following gdb commands:
     `bt full' and `xbacktrace'.
If you would like to further debug the crash, please read the file
c:/Program Files/emacs-23.1/etc/DEBUG for instructions.


In GNU Emacs 23.1.1 (i386-mingw-nt5.1.2600)
  of 2009-07-30 on SOFT-MJASON
Windowing system distributor `Microsoft Corp.', version 5.1.2600
configured using `configure --with-gcc (4.4)'

Important settings:
   value of $LC_ALL: nil
   value of $LC_COLLATE: nil
   value of $LC_CTYPE: nil
   value of $LC_MESSAGES: nil
   value of $LC_MONETARY: nil
   value of $LC_NUMERIC: nil
   value of $LC_TIME: nil
   value of $LANG: ENU
   value of $XMODIFIERS: nil
   locale-coding-system: cp1252
   default-enable-multibyte-characters: t

Major mode: Shell

Minor modes in effect:
   shell-dirtrack-mode: t
   tool-bar-mode: t
   mouse-wheel-mode: t
   menu-bar-mode: t
   file-name-shadow-mode: t
   global-auto-composition-mode: t
   auto-composition-mode: t
   auto-encryption-mode: t
   auto-compression-mode: t
   line-number-mode: t

Recent input:
M-x e m e r g e SPC f i l SPC <return> A - <tab> <return>
e x p - n o <tab> l <tab> <return> C-x b * m e r <tab>
<return> n M-x C-y <return>

Recent messages:
Loading vc-git...done
Auto-saving...
Errors found in diff/diff3 output.  Merge buffer is *merge*.
Mark set
Quit
~/my documents/expsrc/A-exp-notation.lisp and c:/documents and 
settings/mhd/My Documents/expsrc/A-exp-notation.lisp are the same file
~/my documents/expsrc/exp-notation.lisp and c:/documents and 
settings/mhd/My Documents/expsrc/exp-notation.lisp are the same file
Auto-saving...
Errors found in diff/diff3 output.  Merge buffer is *merge*.
Mark set [2 times]