You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2019/05/13 06:59:07 UTC

[groovy] 07/09: Split history main/resources/org/codehaus/groovy/tools/shell to main/resources/org/apache/groovy/groovysh - resolve conflict and keep both files

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 5d38041858da75dee3fe30107480f9e634af6baa
Merge: bb75980 d5b8318
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon May 13 14:15:06 2019 +1000

    Split history main/resources/org/codehaus/groovy/tools/shell to main/resources/org/apache/groovy/groovysh - resolve conflict and keep both files

 .../apache/groovy/groovysh/CommandAlias.properties | 21 ++++++++++
 .../groovy/groovysh/CommandSupport.properties      | 21 ++++++++++
 .../org/apache/groovy/groovysh/Groovysh.properties | 34 +++++++++++++++
 .../org/apache/groovy/groovysh/Main.properties     | 49 ++++++++++++++++++++++
 .../groovysh/commands/AliasCommand.properties      | 22 ++++++++++
 .../groovysh/commands/ClearCommand.properties      | 22 ++++++++++
 .../groovysh/commands/DisplayCommand.properties    | 22 ++++++++++
 .../groovy/groovysh/commands/DocCommand.properties | 21 ++++++++++
 .../groovysh/commands/EditCommand.properties       | 21 ++++++++++
 .../groovysh/commands/ExitCommand.properties       | 24 +++++++++++
 .../groovysh/commands/GrabCommand.properties       | 21 ++++++++++
 .../groovysh/commands/HelpCommand.properties       | 21 ++++++++++
 .../groovysh/commands/HistoryCommand.properties    | 21 ++++++++++
 .../groovysh/commands/ImportCommand.properties     | 22 ++++++++++
 .../groovysh/commands/InspectCommand.properties    | 22 ++++++++++
 .../groovysh/commands/LoadCommand.properties       | 22 ++++++++++
 .../groovysh/commands/PurgeCommand.properties      | 22 ++++++++++
 .../groovysh/commands/RecordCommand.properties     | 22 ++++++++++
 .../groovysh/commands/RegisterCommand.properties   | 21 ++++++++++
 .../groovysh/commands/SaveCommand.properties       | 22 ++++++++++
 .../groovy/groovysh/commands/SetCommand.properties | 22 ++++++++++
 .../groovysh/commands/ShadowCommand.properties     | 22 ++++++++++
 .../groovysh/commands/ShowCommand.properties       | 22 ++++++++++
 23 files changed, 539 insertions(+)