Mercurial > hg > gitweb

diff tests/test-conflict @ 547:4fc63e22b1fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: 1742d7ba2093dc643b57e45167cb2d794212cbb9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxPCQywK+sNU5EO8RAkr0AJ9qut/31lCLQ/xY3FWaF3c21RhS7wCfW1eV 3WexPDsJldMAr3V5vc9eowA= =pJYu -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 30 Jun 2005 23:28:16 -0800
parents ee4c80d294e5 3d4d5f2aba9a
children eb46971fc57f
line wrap: on
line diff
--- a/tests/test-conflict	Thu Jun 30 23:23:12 2005 -0800
+++ b/tests/test-conflict	Thu Jun 30 23:28:16 2005 -0800
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -x
 hg init