diff options
| author | Tomasz Zarna <tomasz.zarna@tasktop.com> | 2012-01-12 18:32:53 +0100 |
|---|---|---|
| committer | Tomasz Zarna <tomasz.zarna@tasktop.com> | 2013-04-04 15:11:49 +0200 |
| commit | 545358577376bec8fc140a76ce0f72bf81cc0a94 (patch) | |
| tree | 410629280cc5f6a62a09334b0a28937214539928 /org.eclipse.jgit.pgm/.settings | |
| parent | 81b601de53125bbcd30620b58168154d7541d8ad (diff) | |
| download | jgit-545358577376bec8fc140a76ce0f72bf81cc0a94.tar.gz jgit-545358577376bec8fc140a76ce0f72bf81cc0a94.zip | |
Add the no-commit option to MergeCommand
Added also tests and the associated option for the command line Merge
command.
Bug: 335091
Change-Id: Ie321c572284a6f64765a81674089fc408a10d059
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.pgm/.settings')
| -rw-r--r-- | org.eclipse.jgit.pgm/.settings/.api_filters | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/org.eclipse.jgit.pgm/.settings/.api_filters b/org.eclipse.jgit.pgm/.settings/.api_filters index 5e044ee2ad..35db29c922 100644 --- a/org.eclipse.jgit.pgm/.settings/.api_filters +++ b/org.eclipse.jgit.pgm/.settings/.api_filters @@ -3,6 +3,11 @@ <resource path="src/org/eclipse/jgit/pgm/CLIText.java" type="org.eclipse.jgit.pgm.CLIText"> <filter id="1143996420"> <message_arguments> + <message_argument value="mergeWentWellStoppedBeforeCommitting"/> + </message_arguments> + </filter> + <filter id="1143996420"> + <message_arguments> <message_argument value="noSuchRemoteRef"/> </message_arguments> </filter> |