[Wine] Regression testing Money 2004

[Tony Pursell]

Hi all

My attempts at regression testing Money 2004 continue.  The problem I
have is that 

git bisect good

doesn't move on.  Here is the bisect log after some compiles:

git-bisect start
# bad: [10affb33aa90f949dca5ea0e3bf168f993edb9d6] Release 0.9.12.
git-bisect bad 10affb33aa90f949dca5ea0e3bf168f993edb9d6
# good: [af1714c70a8e138c4200c7840bdc4913c97b7767] Release 0.9.9.
git-bisect good af1714c70a8e138c4200c7840bdc4913c97b7767
# good: [ff0d10983c9ae7c6b225c7b81f2cb56e738cded7] imaadp32: Renamed the
dlls/msacm/imaadp32 directory to dlls/imaadp32.acm.
git-bisect good ff0d10983c9ae7c6b225c7b81f2cb56e738cded7
# good: [ff0d10983c9ae7c6b225c7b81f2cb56e738cded7] imaadp32: Renamed the
dlls/msacm/imaadp32 directory to dlls/imaadp32.acm.
git-bisect good ff0d10983c9ae7c6b225c7b81f2cb56e738cded7
# good: [ff0d10983c9ae7c6b225c7b81f2cb56e738cded7] imaadp32: Renamed the
dlls/msacm/imaadp32 directory to dlls/imaadp32.acm.
git-bisect good ff0d10983c9ae7c6b225c7b81f2cb56e738cded7
# good: [ff0d10983c9ae7c6b225c7b81f2cb56e738cded7] imaadp32: Renamed the
dlls/msacm/imaadp32 directory to dlls/imaadp32.acm.
git-bisect good ff0d10983c9ae7c6b225c7b81f2cb56e738cded7

The instructions say I should only need to do

git bisect good (or bad)

each time after the compile and test. Is that right? It has reported

Bisecting: 204 revisions left to test after this

and repeated the same compile for the last three runs.  There is an
error message after 'git bisect good':

fatal: Entry 'tools/winewrapper' not uptodate. Cannot merge.

Does this have something to do with it?

Tony