Mercurial > hg

diff tests/test-shelve.t @ 19973:1184edaead7a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: ensure valid git diffs if source/destination file is missing (issue4046) This is arguably a workaround, a better fix may be in the repo to ensure that it won't list a file 'modified' unless there is a file context for the previous version.
author Johan Bjork <jbjoerk@gmail.com>
date Sun, 13 Oct 2013 08:38:30 -0400
parents 6f29cc567845
children 99c4b8f79324
line wrap: on
line diff
--- a/tests/test-shelve.t	Sun Oct 27 00:24:25 2013 +0900
+++ b/tests/test-shelve.t	Sun Oct 13 08:38:30 2013 -0400
@@ -228,6 +228,7 @@
   +a
   +>>>>>>> other
   diff --git a/b.rename/b b/b.rename/b
+  new file mode 100644
   --- /dev/null
   +++ b/b.rename/b
   @@ -0,0 +1,1 @@
@@ -239,6 +240,7 @@
   @@ -1,1 +0,0 @@
   -b
   diff --git a/c.copy b/c.copy
+  new file mode 100644
   --- /dev/null
   +++ b/c.copy
   @@ -0,0 +1,1 @@