Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3 @ 610:4c02464cb9f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
check export options for changeset before running # HG changeset patch # User shaleh@speakeasy.net # Node ID 0cc64f4312540b2081c76dc589cc825d734676d8 # Parent f7bfe827ea381afc89f486b2d93d7f4fe86de04d check export options for changeset before running diff -r f7bfe827ea38 -r 0cc64f431254 mercurial/commands.py
author shaleh@speakeasy.net
date Mon, 04 Jul 2005 11:06:01 -0800
parents 2fe8d66e3075
children 7e4843b7efd2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
1 #!/bin/sh -x
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
2
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
3 hg init
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
4 echo This is file a1 > a
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
5 hg add a
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
6 hg commit -t "commit #0" -d "0 0" -u user
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
7 touch b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
8 hg add b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
9 rm b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
10 hg commit -A -t"comment #1" -d "0 0" -u user