mergetool: Add a test for running mergetool in a sub-directory
mergetool: Add a test for running mergetool in a sub-directory

Signed-off-by: Charles Bailey <cbdb0cc7f3f5b4be81a75fa7242590e3e9882e1e@hashpling.org>
Signed-off-by: Junio C Hamano <a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com>

destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git