use 3way merge for git-am

Signed-off-by: MORITA Kazutaka <[email protected]>

Author: kazum

git-qpush

@@ -124,7 +124,5 @@ for p in $(sed -n -e "${sidx},${eidx}p" "$series"); do
 	echo "Patch applied."
     elif [ -z "$abort_flag" ]; then
 	die "Patch applied with rejects. Fix it up, and refresh."
-    else
-	die "To force apply this patch, use 'git qpush -f'"
     fi
 done

git-qsh-setup

@@ -114,7 +114,7 @@ push_patch()
 	if [ "$bail_action" = abort ]; then
 	    reject=""
 	fi
-	git am -s $reject "$p" > /dev/null 2> "$TMP_LOG"
+	git am -3 -s $reject "$p" > /dev/null 2> "$TMP_LOG"
 	__push_patch_bail=$?
 
 	if [ $__push_patch_bail -ne 0 ]; then