patch: remove internal patcher fallback and NoHunk error
By now the internal patcher is probably more reliable than anything we might
find on the command line.
test-subrepo-svn.t: ignore that subversion %-encodes $TESTTMP
Use a glob instead of expecting $TESTTMP.
merge: handle no file parent in backwards merge (
issue2364)