3 Commits

Author	SHA1	Message	Date
muratayusuke	f8a6fb9ce2	follow Ruby Style Guide for some points	2013-11-23 19:37:23 +01:00
Joshua Nichols	cde7989e85	Fix conflict resolution when destination is a plain file (not a symlink).	2010-03-31 23:18:38 -04:00
Joshua Nichols	0277901561	SPIIIIIKE	2010-03-04 00:19:35 -05:00