/* merge-three-way.h:
 *
 ****************************************************************
 * Copyright (C) 2004 Aaron Bentley
 *
 * See the file "COPYING" for further information about
 * the copyright and warranty status of this work.
 */

#ifndef INCLUDE__LIBARCH__MERGE_THREE_WAY_H
#define INCLUDE__LIBARCH__MERGE_THREE_WAY_H


#include "hackerlab/machine/types.h"
#include "libarch/archive.h"
#include "libarch/project-tree.h"


/* automatically generated __STDC__ prototypes */
extern int arch_merge3(int chatter_fd, arch_project_tree_t * mine_tree, arch_project_tree_t * base_tree, arch_project_tree_t * other_tree, int escape_classes, int show_noops);
#endif  /* INCLUDE__LIBARCH__MERGE_THREE_WAY_H */



/* tag: b8f88909-1a0e-4a65-8f9b-4e52e7482f54 */