summaryrefslogtreecommitdiffstats
path: root/root/.gitsync_merge.sample
Commit message (Collapse)AuthorAgeFilesLines
* Add support for an automatic merge list to gitsync, properly escape ↵Erik Fonnesbeck2010-09-161-0/+3
user-supplied parameters, and improve error handling a bit.
OpenPOWER on IntegriCloud