##// END OF EJS Templates
merge-logic: improve merge failed because of conflicts message.
merge-logic: improve merge failed because of conflicts message.

File last commit:

r1282:90601d74 default
r1345:b48f493b default
Show More
login2.html
9 lines | 178 B | text/html | HtmlLexer
## -*- coding: utf-8 -*-
<%
# Tweaks needed to simulate things
c.came_from = ""
%>
## Include the original file here for easy operation
<%include file="/login.mako" />