to this example added ours/theirs policies and moved my-file.mrg to /lib direcory#4
Open
AlexeiKharchev wants to merge 2 commits into
Open
to this example added ours/theirs policies and moved my-file.mrg to /lib direcory#4AlexeiKharchev wants to merge 2 commits into
AlexeiKharchev wants to merge 2 commits into