view tests/test-notify-changegroup.out @ 7785:660c8dd44060

test-merge-tool: Make sure no hgmerge can be found in $PATH

The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.

% clone
updating working directory
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% commit
adding a
% commit
% push
pushing to ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Date:
Subject: test-notify-changegroup/a: 2 new changesets
From: test
X-Hg-Notification: changeset cb9a9f314b8b
Message-Id:
To: baz, foo@bar

changeset cb9a9f314b8b in test-notify-changegroup/a
details: test-notify-changegroup/a?cmd=changeset;node=cb9a9f314b8b
summary: a

changeset ba677d0156c1 in test-notify-changegroup/a
details: test-notify-changegroup/a?cmd=changeset;node=ba677d0156c1
summary: b

diffs (6 lines):

diff -r 000000000000 -r ba677d0156c1 a
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/a	Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,2 @@
+a
+a