Mercurial > hg

annotate tests/test-merge-revert.out @ 1340:faa62c7685fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 5a034646e472
children 7544700fd931
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 896
diff changeset
1 1:3aa14bbc23d9
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 896
diff changeset
2 0:8633637036c1
792
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
3 3aa14bbc23d9 tip
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
4 8633637036c1
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
5 8633637036c1+
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
6 8633637036c1
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
7 3aa14bbc23d9 tip
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
8 merging file1
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
9 3aa14bbc23d9 tip
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 896
diff changeset
10 3aa14bbc23d9 tip
792
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
11 3aa14bbc23d9 tip
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
12 3aa14bbc23d9 tip