Merge branch 'es/overlapping-range-set'

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 531095916f959f47cc3fca38bafe9cbef604c0d9..75a991f7ec8a2e4926cb925ad9ff23be2f6aedeb 100755 (executable)
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -734,7 +734,7 @@ sub parse_diff {
        my ($path) = @_;
        my @diff_cmd = split(" ", $patch_mode_flavour{DIFF});
        if (defined $diff_algorithm) {
-               push @diff_cmd, "--diff-algorithm=${diff_algorithm}";
+               splice @diff_cmd, 1, 0, "--diff-algorithm=${diff_algorithm}";
        }
        if (defined $patch_mode_revision) {
                push @diff_cmd, $patch_mode_revision;