aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorvg <vgm+dev@devys.org>2019-11-23 13:18:13 +0100
committervg <vgm+dev@devys.org>2019-11-23 13:18:13 +0100
commita0f6cf9ea9fc0ca36263001a20bf1d0e00987731 (patch)
tree3e7c8ae0b2499e1fb8abdd367c6c54e977df29e6 /conf
parent6747e12f8f57b1c62308d3d509927f0af6f2498d (diff)
downloadscripts-a0f6cf9ea9fc0ca36263001a20bf1d0e00987731.tar.gz
scripts-a0f6cf9ea9fc0ca36263001a20bf1d0e00987731.tar.bz2
scripts-a0f6cf9ea9fc0ca36263001a20bf1d0e00987731.zip
Rename git-sync to s/$/-noconflict/
Rename this command as their will be a new version failing in case of conflict instead of duplicating conflicting files.
Diffstat (limited to 'conf')
0 files changed, 0 insertions, 0 deletions