annotate tests/test-issue1438.out @ 10862:f97b98db6fd1

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 05 Apr 2010 17:48:48 -0500
parents 2c5b2abfb8be
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7783
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2 applying bad.patch
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 R link
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 ? bad.patch