diff --git a/apatch b/apatch index 5cf8989..08e68a2 100755 --- a/apatch +++ b/apatch @@ -41,6 +41,7 @@ done git apply --reject --whitespace=fix "$patchpath" || { git status --porcelain | grep '\?\? .*\.rej$' | cut -c4- | while read -r reject; do target="${reject%.rej}" + echo "[*] trying to wiggle $target" wiggle --merge --replace "$target" "$reject" || { echo "[!] could not merge $target, fix manually" }