annotate tests/test-issue1438.out @ 11977:db2a291e25e9

tests: unify test-merge4
author Pradeepkumar Gayam <in3xes@gmail.com>
date Wed, 18 Aug 2010 05:12:44 +0530
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