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.
hgmerge
changeset 544 3d4d5f2aba9a
parent 306 f06a4a3b86a7
child 547 4fc63e22b1fe 
--- a/hgmerge
+++ b/hgmerge
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # hgmerge - default merge helper for Mercurial
 #
mercurial-crew-with-dirclash