Mercurial > public > mercurial-scm > hg-stable

diff tests/test-rebase-inmemory.t @ 38448:e6b643ccf87d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: make dry-run return 1 or 0 according to result In dry-run mode, if there is no conflict return 0, if any then return 1 Differential Revision: https://phab.mercurial-scm.org/D3829
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sat, 23 Jun 2018 08:59:18 +0530
parents f4f1fb1cbfb4
children c892a30bafb9
line wrap: on
line diff
--- a/tests/test-rebase-inmemory.t	Fri Mar 24 00:33:35 2017 -0400
+++ b/tests/test-rebase-inmemory.t	Sat Jun 23 08:59:18 2018 +0530
@@ -287,6 +287,7 @@
   rollback completed
   hit a merge conflict
   rebase aborted
+  [1]
   $ hg diff
   $ hg status
   $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
@@ -322,3 +323,4 @@
   merging e
   hit a merge conflict
   rebase aborted
+  [1]