diff options
| author | Robin Stocker <robin@nibor.org> | 2013-04-19 19:44:24 +0200 |
|---|---|---|
| committer | Robin Stocker <robin@nibor.org> | 2013-04-19 19:55:24 +0200 |
| commit | a50ed5666ff41b2b08d09adffad5368b33871e45 (patch) | |
| tree | 9ddb394abf9de9176f49a7cfc72a3b101140da8c /org.eclipse.jgit.pgm.test/tst | |
| parent | ee222a3be1e8b902667a739625047eef29154924 (diff) | |
| download | jgit-a50ed5666ff41b2b08d09adffad5368b33871e45.tar.gz jgit-a50ed5666ff41b2b08d09adffad5368b33871e45.zip | |
status: Print conflict description for unmerged paths
Prefix unmerged paths with conflict description (e.g. "both modified:"),
the same way C Git does.
Change-Id: I083cd191ae2ad3e2460aa4052774aed6e36c2699
Diffstat (limited to 'org.eclipse.jgit.pgm.test/tst')
| -rw-r--r-- | org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/StatusTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/StatusTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/StatusTest.java index 13f8c319c1..73ae598a8c 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/StatusTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/StatusTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012, François Rey <eclipse.org_@_francois_._rey_._name> + * Copyright (C) 2012, 2013 François Rey <eclipse.org_@_francois_._rey_._name> * and other copyright owners as documented in the project's IP log. * * This program and the accompanying materials are made available @@ -191,7 +191,7 @@ public class StatusTest extends CLIRepositoryTestCase { "# On branch master", // "# Unmerged paths:", // "# ", // - "# \tunmerged", // + "# \tboth modified: unmerged", // "# ", // "# Untracked files:", // "# ", // @@ -205,7 +205,7 @@ public class StatusTest extends CLIRepositoryTestCase { "# Not currently on any branch.", // "# Unmerged paths:", // "# ", // - "# \tunmerged", // + "# \tboth modified: unmerged", // "# ", // "# Untracked files:", // "# ", // |