tree 35fcbe517cb80f10c22d66fd2d392c78426167e3
parent 0608d0104bbc898640d82f9af72eba55ead0b751
author salsubaiee <salsubaiee@gmail.com> 1379918547 -0700
committer salsubaiee <salsubaiee@gmail.com> 1379918547 -0700

Allowed user to specify the merging policy