Erik Fonnesbeck 97e6256f4d Add support for an automatic merge list to gitsync, properly escape user-supplied parameters, and improve error handling a bit.		2010-09-16 02:40:17 -06:00
..
.gitsync_merge.sample
.shrc
.tcshrc