[jbossts-issues] [JBoss JIRA] (JBTM-1315) track ci for upgrade to git 1.7.3

[Tom Jenkinson (JIRA)]

     [ https://issues.jboss.org/browse/JBTM-1315?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Tom Jenkinson resolved JBTM-1315.
---------------------------------

    Resolution: Out of Date


No longer doing an auto-merge
                
> 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: Task
>      Security Level: Public(Everyone can see) 
>          Components: Build System, Testing
>            Reporter: Tom Jenkinson
>
> 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