Tom Jenkinson created JBTM-1315: ----------------------------------- Summary: track ci for upgrade to git 1.7.3 Key: JBTM-1315 URL: https://issues.jboss.org/browse/JBTM-1315 Project: JBoss Transaction Manager Issue Type: Feature Request Security Level: Public (Everyone can see) Reporter: Tom Jenkinson Assignee: Paul Robinson Fix For: later When this occurs we can back out the while loop that does a rebase and use the standard -s recursive -Xtheirs -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira