t: don't use well-known git aliases

Not everybody has them, which can cause the test script to
abort.
t: fix relative path to git-imerge