Mercurial > hg
diff tests/test-record.out @ 8811:8b35b08724eb
Make mq, record and transplant honor patch.eol
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 15 Jun 2009 00:03:27 +0200 |
parents | a21605de1509 |
children | 9b8c9266c59d |
line wrap: on
line diff
--- a/tests/test-record.out Mon Jun 15 00:03:26 2009 +0200 +++ b/tests/test-record.out Mon Jun 15 00:03:27 2009 +0200 @@ -572,3 +572,27 @@ b +c +% with win32ext +diff --git a/subdir/f1 b/subdir/f1 +1 hunks, 1 lines changed +examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -3,3 +3,4 @@ + a + b + c ++d +record this change to 'subdir/f1'? [Ynsfdaq?] +changeset: 25:49b3838dc9e7 +tag: tip +user: test +date: Thu Jan 01 00:00:23 1970 +0000 +summary: w1 + +diff -r 8fd83ff53ce6 -r 49b3838dc9e7 subdir/f1 +--- a/subdir/f1 Thu Jan 01 00:00:22 1970 +0000 ++++ b/subdir/f1 Thu Jan 01 00:00:23 1970 +0000 +@@ -3,3 +3,4 @@ + a + b + c ++d +