diff -r 69dae7982c85 -r 35729bdd59b6 tests/test-histedit-outgoing.out --- a/tests/test-histedit-outgoing.out Sat Jun 30 03:34:41 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -3 files updated, 0 files merged, 0 files removed, 0 files unresolved -% show the edit commands offered by outgoing -pick 055a42cdd887 3 d -pick e860deea161a 4 e -pick 652413bf663e 5 f - -# Edit history between 055a42cdd887 and 652413bf663e -# -# Commands: -# p, pick = use commit -# e, edit = use commit, but stop for amending -# f, fold = use commit, but fold into previous commit (combines N and N-1) -# d, drop = remove commit from history -# m, mess = edit message without changing commit content -# -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -% show the error from unrelated repos -abort: repository is unrelated -% show the error from unrelated repos -comparing with ../r -searching for changes -warning: repository is unrelated -pick 2a4042b45417 0 g -pick 68c46b4927ce 1 h -pick 51281e65ba79 2 i - -# Edit history between 2a4042b45417 and 51281e65ba79 -# -# Commands: -# p, pick = use commit -# e, edit = use commit, but stop for amending -# f, fold = use commit, but fold into previous commit (combines N and N-1) -# d, drop = remove commit from history -# m, mess = edit message without changing commit content -# -0 files updated, 0 files merged, 0 files removed, 0 files unresolved