wilderjds
/
syncthing-resolve-conflicts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8 Commits
1 Branch
0 Tags
426 KiB
Tag: Branch: Tree: 82633595b4
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '82633595b4'
${ noResults }
Commit Graph

8 Commits (82633595b405b25d0e7b28cc8f8b95530a79c4a8)
 

Author SHA1 Message Date
Manpreet Singh 82633595b4 Fixed name shown to match actual script name
9 years ago
Dominik Schrempf 39b723a9b4 Merge pull request #1 from junkblocker/master
9 years ago
Manpreet Singh 33b59c99b2 Added support for Darwin, some interaction improvement, and style lint
9 years ago
Dominik Schrempf 64b7165669 Correct handling of recursive conflicts.
9 years ago
Dominik Schrempf c75786682b Improve info in readme.
9 years ago
Dominik Schrempf 0f52233489 Improve readme.
9 years ago
Dominik Schrempf d193277014 Initial commit.
9 years ago
Dominik Schrempf 1229d41f36 Initial commit
9 years ago