X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=cc%2Fbin_merge;fp=cc%2Fbin_merge;h=fbe7066e5ff368829de6fb5fe17f4fd26199a814;hb=64b1fd397779f5b896e23fcca190b3e42f244145;hp=fbe7066e5ff368829de6fb5fe17f4fd26199a814;hpb=7c11b11a13e503cebddd3343aa77f26c48d06fc7;p=clearscm.git

diff --git a/cc/bin_merge b/cc/bin_merge
old mode 100644
new mode 100755