merge with stable

Makefile

@@ -16,6 +16,7 b' export LANGUAGE=C'
 export LC_ALL=C
 TESTFLAGS ?= $(shell echo $$HGTESTFLAGS)
 OSXVERSIONFLAGS ?= $(shell echo $$OSXVERSIONFLAGS)
+CARGO = cargo
 
 # Set this to e.g. "mingw32" to use a non-default compiler.
 COMPILER=
@@ -110,6 +111,10 b' dist-notests:\tdoc MANIFEST.in'
 check: tests
 
 tests:
+        # Run Rust tests if cargo is installed
+	if command -v $(CARGO) >/dev/null 2>&1; then \
+		cd $(HGROOT)/rust/hg-cpython && $(CARGO) test --quiet --all; \
+	fi
 	cd tests && $(PYTHON) run-tests.py $(TESTFLAGS)
 
 test-%:

tests/test-merge-combination.t

@@ -57,7 +57,7 b' revision. "C" indicates that hg merge ha'
   >                fi
   >           else expected=a
   >           fi
-  >           got=`hg log -r 3 --template '{files}\n' | tr --delete 'e '`
+  >           got=`hg log -r 3 --template '{files}\n' | tr -d 'e '`
   >           if [ "$got" = "$expected" ]
   >           then echo "$line$conflicts: agree on \"$got\""
   >           else echo "$line$conflicts: hg said \"$got\", expected \"$expected\""