Index: trac/ticket/web_ui.py
===================================================================
--- trac/ticket/web_ui.py       (revision 218)
+++ trac/ticket/web_ui.py       (working copy)
@@ -479,6 +479,7 @@

         # Mid air collision?
         if int(req.args.get('ts')) != ticket.time_changed:
+            ts = ticket.time_changed
             self._insert_ticket_data(req, None, ticket,
                                      req.args.get('author'))
             self._populate_misc(req, db)
@@ -487,6 +488,7 @@
             self._insert_ticket_data(req, None, ticket,
                                      req.args.get('author'))
             self._populate_misc(req, db)
+            req.hdf['ticket.ts'] = ts
             return 'ticket_error_midair.cs', None

         self._validate_ticket(req, ticket)
Index: templates/ticket_error_midair.cs
===================================================================
--- templates/ticket_error_midair.cs    (revision 218)
+++ templates/ticket_error_midair.cs    (working copy)
@@ -19,18 +19,22 @@
    }
  </script>
  <form action="<?cs var:ticket.href ?>#preview" method="post">
- <input type="hidden" name="author" value="<?cs var:ticket.reporter_id ?>" />
- <table cellspacing="0" border="1">
-  <tr>
-   <th>&nbsp;</th>
-   <th colspan="2">Committed</th>
-   <th colspan="2">Yours</th>
-   <th colspan="2">Merged</th>
-  </tr><?cs
+ <input type="hidden" name="author" value="<?cs var:newticket.reporter_id ?>" />
+ <?cs set:t.started = 0 ?>
+ <?cs
   each:field = ticket.fields ?><?cs
    if:ticket[name(field)] == newticket[name(field)] ?>
    <input type="hidden" name="<?cs var:name(field) ?>" value="<?cs var:newticket[name(field)] ?>" /><?cs
-   else ?>
+   else ?><?cs
+    if:! t.started ?>
+     <table cellspacing="0" border="1">
+      <tr>
+       <th>&nbsp;</th>
+       <th colspan="2">Committed</th>
+       <th colspan="2">Yours</th>
+       <th colspan="2">Merged</th>
+      </tr><?cs
+    /if ?>
     <tr>
      <th><?cs var:name(field) ?></th>
      <td><input type="radio" name="sel_<?cs var:name(field) ?>" id="sel_<?cs var:name(field) ?>_old" onclick="setField('<?cs var:name(field) ?>', 'old');" /></td>
@@ -45,16 +49,20 @@
      </td>
     </tr><?cs
    /if ?><?cs
-  /each ?>
-  <input type="hidden" name="reassign_owner" value="<?cs var:ticket.reassign_owner ?>" />
-  <input type="hidden" name="action" value="<?cs var:ticket.action ?>" />
-  <input type="hidden" name="ts" value="<?cs var:ticket.ts ?>" />
-  <input type="hidden" name="comment" value="<?cs var:ticket.comment ?>" />
- </table>
+  /each ?><?cs
+ if:t.started ?>
+  </table><?cs
+ /if ?>
+ <input type="hidden" name="reassign_owner" value="<?cs var:newticket.reassign_owner ?>" />
+ <input type="hidden" name="action" value="<?cs var:newticket.action ?>" />
+ <input type="hidden" name="ts" value="<?cs var:ticket.ts ?>" />
+ <input type="hidden" name="comment" value="<?cs var:newticket.comment ?>" />

   <div class="buttons">
    <input type="submit" name="preview" value="Retry"  />&nbsp;
   </div>
+<?cs var:ticket.ts ?><br />
+<?cs var:newticket.ts ?>
  </form>
 </div>