aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm/.settings
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.jgit.pgm/.settings')
-rw-r--r--org.eclipse.jgit.pgm/.settings/.api_filters5
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>