diff mercurial-server/resources/buildServerResources/mercurialSettings.jsp @ 672:8b09ec36fbef

Ability to specify an author of the merge commit
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Fri, 18 Oct 2013 15:07:44 +0400
parents 3db16531f7ba
children c0b08dd02418
line wrap: on
line diff
--- a/mercurial-server/resources/buildServerResources/mercurialSettings.jsp	Wed Oct 16 14:33:41 2013 +0400
+++ b/mercurial-server/resources/buildServerResources/mercurialSettings.jsp	Fri Oct 18 15:07:44 2013 +0400
@@ -50,7 +50,7 @@
       </td>
     </tr>
   <tr class="advancedSetting">
-    <th><label for="tagUsername">Username for tags: </label></th>
+    <th><label for="tagUsername">Username for tags/merge: </label></th>
     <td><props:textProperty name="tagUsername"/>
       <div class="smallNote" style="margin: 0;">Format: User Name &lt;email&gt;</div>
     </td>