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

diff --git a/git-am.sh b/git-am.sh
index e20dd88392c892a6b88e29501e0b13be8a73aaf9..b1c05c9db3ba28220ec21ac8eddeb519a02df640 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -19,6 +19,7 @@ whitespace=     pass it through git-apply
 directory=      pass it through git-apply
 C=              pass it through git-apply
 p=              pass it through git-apply
+reject          pass it through git-apply
 resolvemsg=     override error message when patch failure occurs
 r,resolved      to be used after a patch failure
 skip            skip the current patch
@@ -168,6 +169,8 @@ do
                git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
        -C|-p)
                git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;
+       --reject)
+               git_apply_opt="$git_apply_opt $1" ;;
        --)
                shift; break ;;
        *)