apply: check D/F conflicts more carefully.

diff --git a/git-rebase.sh b/git-rebase.sh
index 3945e067141ec1bc87456179a59de8f692bdf9fa..1b9e986926cf5b7d25afc6e0dc81ff9fc56c370a 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -311,7 +311,7 @@ echo "$prev_head" > "$dotest/prev_head"
 
 msgnum=0
 for cmt in `git-rev-list --no-merges "$upstream"..ORIG_HEAD \
-                       | perl -e 'print reverse <>'`
+                       | @@PERL@@ -e 'print reverse <>'`
 do
        msgnum=$(($msgnum + 1))
        echo "$cmt" > "$dotest/cmt.$msgnum"