wilderjds
/
syncthing-resolve-conflicts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
2 Commits
1 Branch
0 Tags
426 KiB
 
Tag: Branch: Tree: d193277014
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'd193277014'
${ noResults }
Go to file
Dominik Schrempf d193277014
Initial commit. 		9 years ago
LICENSE Initial commit 9 years ago
README.md Initial commit 9 years ago
syncthing-resolve-conflicts.sh Initial commit. 9 years ago

README.md

syncthing-resolve-conflicts

A small bash script that handles synchronization conflicts with Syncthing. Inspired by 'pacdiff' from Arch Linux.