summaryrefslogtreecommitdiffstats
path: root/root/.gitsync_merge.sample
Commit message (Expand)AuthorAgeFilesLines
* Add support for an automatic merge list to gitsync, properly escape user-supp...Erik Fonnesbeck2010-09-161-0/+3
OpenPOWER on IntegriCloud