aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/git-sync-noconflict
Commit message (Collapse)AuthorAgeFilesLines
* Rename git-sync to s/$/-noconflict/vg2019-11-231-0/+93
Rename this command as their will be a new version failing in case of conflict instead of duplicating conflicting files.