Changeset 84701 in spip-zone for _dev_


Ignore:
Timestamp:
Sep 16, 2014, 3:27:56 PM (5 years ago)
Author:
kent1@…
Message:

Accepter les conflits externes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • _dev_/salvatore2/tireur.php

    r82788 r84701  
    6969                                trad_log("Pas besoin de mettre à jour");
    7070                        else
    71                                 $cmd = "svn update  --non-recursive ".$tmp.$source[1]."/";
     71                                $cmd = "svn update --non-recursive --accept theirs-full ".$tmp.$source[1]."/";
    7272                }
    7373        }else
Note: See TracChangeset for help on using the changeset viewer.