139     def __init__(self, dir):  argument
142     def init(self):  argument
149     def commit_all(self, id, msg):  argument
156     def checkout_branch(self, branch, is_new=False):  argument
165     def merge(self, branch):  argument
180     def check_resolved_from_cache(self):  argument
210     def has_changes(self):  argument
215     def has_conflicts(self):  argument
220     def is_merging(self):  argument
225     def complete_merge(self):  argument
236     def load_resolve_files(self, resolve_dir):  argument
244     def save_resolve_files(self, resolve_dir):  argument
252     def __init__(self, repo_dir, rel_path, resolve_dir):  argument
260     def create_working_dir(self):  argument
278     def copy_upstream_files(self, version, msg):  argument
283     def copy_base_files(self, base_version):  argument
287     def copy_target_files(self, target_version):  argument
291     def copy_ojluni_files(self):  argument
300     def run_ojluni_merge(self):  argument
310     def copy_back_to_ojluni(self):  argument
321     def run(self, base_version, target_version):  argument
347     def complete_existing_run(self):  argument