Mercurial > hg

view tests/test-diff-subdir.out @ 9601:11ace5726d02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Dummy-merge with c655432c2c24 (issue1860)
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 16 Oct 2009 11:18:38 +0200
parents 66eff8355168
children
line wrap: on
line source

EVERYTHING
diff -r ec612a6291f1 alpha/one
--- a/alpha/one
+++ b/alpha/one
@@ -0,0 +1,1 @@
+1
diff -r ec612a6291f1 beta/two
--- a/beta/two
+++ b/beta/two
@@ -0,0 +1,1 @@
+2
BETA ONLY
diff -r ec612a6291f1 beta/two
--- a/beta/two
+++ b/beta/two
@@ -0,0 +1,1 @@
+2
INSIDE BETA
diff -r ec612a6291f1 beta/two
--- a/beta/two
+++ b/beta/two
@@ -0,0 +1,1 @@
+2