%PDF- %PDF-
Mini Shell

Mini Shell

Direktori : /data/old/home/stash/atlassian/stash/3.7.1/atlassian-stash/static/model/
Upload File :
Create Path :
Current File : //data/old/home/stash/atlassian/stash/3.7.1/atlassian-stash/static/model/conflict-min.js

define("model/conflict",["aui","backbone-brace","model/conflict-change","model/file-change-types"],function(A,C,F,D){var B={};B[D.ADD]={};B[D.ADD][D.ADD]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.add.add");B[D.ADD][D.RENAME]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.add.rename");B[D.ADD][D.MOVE]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.add.move");B[D.MODIFY]={};B[D.MODIFY][D.MODIFY]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.modify.modify");B[D.MODIFY][D.RENAME]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.modify.rename");B[D.MODIFY][D.MOVE]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.modify.move");B[D.MODIFY][D.DELETE]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.modify.delete");B[D.RENAME]={};B[D.RENAME][D.ADD]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.rename.add");B[D.RENAME][D.RENAME]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.rename.rename");B[D.RENAME][D.MOVE]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.rename.move");B[D.RENAME][D.DELETE]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.rename.delete");B[D.MOVE]={};B[D.MOVE][D.ADD]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.move.add");B[D.MOVE][D.RENAME]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.move.rename");B[D.MOVE][D.MOVE]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.move.move");B[D.MOVE][D.DELETE]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.move.delete");B[D.DELETE]={};B[D.DELETE][D.MODIFY]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.delete.modify");B[D.DELETE][D.RENAME]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.delete.rename");B[D.DELETE][D.MOVE]=A.I18n.getText("stash.web.pullrequest.diff.conflict.title.delete.move");var E=C.Model.extend({namedAttributes:{ourChange:F,theirChange:F},getConflictMessage:function(){var H=this.getOurChange()&&this.getOurChange().getType(),G=this.getTheirChange()&&this.getTheirChange().getType();return(B[G]&&B[G][H])||""}});return E});

Zerion Mini Shell 1.0