##// END OF EJS Templates
resolve: don't abort resolve -l even when no merge is in progress...
resolve: don't abort resolve -l even when no merge is in progress This broke some internal automation that was quite reasonably checking for unresolved files as a way to determine whether a merge happened cleanly. We still abort for resolve --mark etc.

File last commit:

r14046:b24e5a70 default
r21541:6062593d default
Show More
footer.tmpl
5 lines | 80 B | application/x-cheetah | CheetahLexer
<script type="text/javascript">process_dates()</script>
{motd}
</body>
</html>