view tests/test-issue672.out @ 10545:b9e4a67329cd stable

Updated contrib/vim/patchreview.* to version 0.2.1
1) adds a :DiffReview command to review code changes
   in the current workspace.

2) removes the need to have patchutils (specifically filterdiff)
   installed on the system by implementing patch extraction in
   pure vim script.

adding 1
adding 2
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
  searching for copies back to rev 1
  unmatched files in other:
   1a
  all copies found (* = to merge, ! = divergent):
   1a -> 1 
  checking for directory renames
resolving manifests
 overwrite None partial False
 ancestor 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a
 1: other deleted -> r
 1a: remote created -> g
update: 1 1/2 files (50.00%)
removing 1
update: 1a 2/2 files (100.00%)
getting 1a
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  searching for copies back to rev 1
  unmatched files in local:
   1a
  all copies found (* = to merge, ! = divergent):
   1a -> 1 *
  checking for directory renames
resolving manifests
 overwrite None partial False
 ancestor c64f439569a9 local e327dca35ac8+ remote 746e9549ea96
 1a: local copied/moved to 1 -> m
preserving 1a for resolve of 1a
update: 1a 1/1 files (100.00%)
picked tool 'internal:merge' for 1a (binary False symlink False)
merging 1a and 1 to 1a
my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
 premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  searching for copies back to rev 1
  unmatched files in other:
   1a
  all copies found (* = to merge, ! = divergent):
   1a -> 1 *
  checking for directory renames
resolving manifests
 overwrite None partial False
 ancestor c64f439569a9 local 746e9549ea96+ remote e327dca35ac8
 1: remote moved to 1a -> m
preserving 1 for resolve of 1a
removing 1
update: 1 1/1 files (100.00%)
picked tool 'internal:merge' for 1a (binary False symlink False)
merging 1 and 1a to 1a
my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d
 premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)