diff --cc cmd/web.go
Simple merge
diff --cc models/user.go
Simple merge
diff --cc routers/user/auth.go
Simple merge
author	无闻 <u@gogs.io>
	Sun, 21 Dec 2014 03:47:05 +0000 (22:47 -0500)
committer	无闻 <u@gogs.io>
	Sun, 21 Dec 2014 03:47:05 +0000 (22:47 -0500)
		1	2
cmd/web.go	patch \|	diff1 \|	diff2 \|	blob \| history
models/user.go	patch \|	diff1 \|	diff2 \|	blob \| history
routers/user/auth.go	patch \|	diff1 \|	diff2 \|	blob \| history