Mercurial > hg
view tests/test-up-local-change.out @ 1340:faa62c7685fb
hgk is a wish script
--- mercurial-0.7.orig/contrib/hgk 2005-09-23 11:02:21.000000000 +0200
+++ mercurial-0.7/contrib/hgk 2005-09-23 11:07:57.000000000 +0200
@@ -1,6 +1,4 @@
-#!/bin/sh
-# Tcl ignores the next line -*- tcl -*- \
-exec wish "$0" -- "${1+$@}"
+#!/usr/bin/wish
# Copyright (C) 2005 Paul Mackerras. All rights reserved.
# This program is free software; it may be used, copied, modified
author | Vincent Danjean |
---|---|
date | Fri, 23 Sep 2005 18:58:57 -0700 |
parents | 4f81068ed8cd |
children | 0e2be889ccd7 |
line wrap: on
line source
adding a diff -r c19d34741b0a a --- a/a +++ b/a @@ -1,1 +1,1 @@ -a +abc adding b M a resolving manifests force None allow None moddirstate True linear True ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e a versions differ, resolve remote created b getting b merging a resolving a file a: other d730145abbf9 ancestor b789fdd96dc2 resolving manifests force None allow 1 moddirstate True linear True ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e changeset: 1:1e71731e6fbb tag: tip user: test date: Thu Jan 1 00:00:00 1970 +0000 summary: 2 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 tag: tip user: test date: Thu Jan 1 00:00:00 1970 +0000 files: a b description: 2 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e user: test date: Thu Jan 1 00:00:00 1970 +0000 files: a description: 1 diff -r 1e71731e6fbb a --- a/a +++ b/a @@ -1,1 +1,1 @@ -a2 +abc