Rev 4: set --reprocess to true as the default behavior. in http://bzr.arbash-meinel.com/plugins/per_file_remerge

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/plugins/per_file_remerge

------------------------------------------------------------
revno: 4
revision-id: john at arbash-meinel.com-20080618140937-75riqlogk81ac8td
parent: john at arbash-meinel.com-20080618140230-3vj2w9t5zlhq3ria
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: per_file_remerge
timestamp: Wed 2008-06-18 09:09:37 -0500
message:
  set --reprocess to true as the default behavior.
-------------- next part --------------
=== modified file 'per_file_remerge.py'
--- a/per_file_remerge.py	2008-06-18 13:50:40 +0000
+++ b/per_file_remerge.py	2008-06-18 14:09:37 +0000
@@ -58,7 +58,7 @@
         merger.interesting_ids = set([file_id])
         merger.merge_type = merge_type
         # merger.show_base = show_base
-        # merger.reprocess = reprocess
+        merger.reprocess = True
         num_conflicts = merger.do_merge()
     finally:
         tree.set_parent_ids(parent_ids)