4 commits

Author	SHA1	Message	Date
Sami Samhuri	e371a21240	keep it simple	2015-06-30 09:10:25 -07:00
Sami Samhuri	42d5eec7d2	vastly improve git-diff-merge-conflict-resolution	2015-06-11 13:16:46 -07:00
Sami Samhuri	49eb453849	more useful	2015-06-10 11:19:38 -07:00
Sami Samhuri	b6536f3061	add some more git commands	2015-06-10 10:46:14 -07:00