Mercurial Mercurial > hg > mercurial-crew-with-dirclash / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-conflict
changeset 547 4fc63e22b1fe
parent 392 ee4c80d294e5
parent 544 3d4d5f2aba9a
child 591 eb46971fc57f 
--- a/tests/test-conflict
+++ b/tests/test-conflict
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -x
 hg init
mercurial-crew-with-dirclash