config.jelly #2 

<?jelly escape-by-default='true'?>
<j:jelly 	xmlns:j="jelly:core" 	xmlns:st="jelly:stapler" 	xmlns:d="jelly:define" 
			xmlns:l="/lib/layout" 	xmlns:t="/lib/hudson" 		xmlns:f="/lib/form">
			
	<f:entry title="Unshelve Changelist" field="shelf">
		<f:textbox />
	</f:entry>
		  
	<f:entry name="resolve" title="Resolve Options" field="resolve">
		<select name="resolve">
			<option value="none">Resolve: None</option>
			<option value="as">Resolve: Safe (-as)</option>
			<option value="af">Resolve: Force Merge (-af)</option>
			<option value="ay">Resolve: Yours (-ay) -- keep your edits</option>
			<option value="at">Resolve: Theirs (-at) -- keep shelf content</option>
		</select>
	</f:entry>
	
</j:jelly>
# Change User Description Committed
#5 22859 paul_allen Missing changes from #54
#4 22315 paul_allen Pending change cleanup for unshelve.

Unshelve would leave files open for add/edit/delete, the 'tidy' option will 'revert -k' the files leaving the content in the workspace, but removing the 'have' list data.

Unshelve can now specify a Credential and Workspace, important for situations where more than one sync occurs in a pipeline script.

JENKINS-43430
#3 20246 paul_allen Convert merge options for unshelve to ListBoxModel Option (from basic jelly)

@atiniir
#2 19519 paul_allen Jelly header update.

<?jelly escape-by-default='true'?>
#1 16529 paul_allen DSL for Unshelve task.

DSL example:
    p4unshelve resolve: 'at', shelf: '10831'