{"id":225932,"date":"2020-12-14T09:13:41","date_gmt":"2020-12-14T01:13:41","guid":{"rendered":"http:\/\/4563.org\/?p=225932"},"modified":"2020-12-14T09:13:41","modified_gmt":"2020-12-14T01:13:41","slug":"%e8%af%b7%e9%97%ae%e4%b8%80%e4%b8%8b%ef%bc%8c%e4%b8%80%e8%88%ac-mergetool-%e9%87%8c%e9%9d%a2%ef%bc%8cbase-local-remote-%e9%83%bd%e5%af%b9%e5%ba%94%e7%9a%84%e6%98%af%e4%bb%80%e4%b9%88%e6%96%87","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=225932","title":{"rendered":"\u8bf7\u95ee\u4e00\u4e0b\uff0c\u4e00\u822c mergetool \u91cc\u9762\uff0c$BASE, $LOCAL, $REMOTE \u90fd\u5bf9\u5e94\u7684\u662f\u4ec0\u4e48\u6587\u4ef6\uff1f"},"content":{"rendered":"<div>\n<div>\n<div>\n<h1>                  \u8bf7\u95ee\u4e00\u4e0b\uff0c\u4e00\u822c mergetool \u91cc\u9762\uff0c$BASE, $LOCAL, $REMOTE \u90fd\u5bf9\u5e94\u7684\u662f\u4ec0\u4e48\u6587\u4ef6\uff1f               <\/h1>\n<p> <\/p>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : yazoox <\/span>  <span><i><\/i> 3<\/span> <\/div>\n<div> <\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n<div isfirst=\"1\"> <\/p>\n<pre><code>cmd = 'C:\/Program Files\/KDiff3\/kdiff3.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\" <\/code><\/pre>\n<p>\u5982\u4e0a\u6240\u793a\uff0cKdiff3 \u7684\u914d\u7f6e\u3002\u8fd9\u4e09\u4e2a\u90fd\u5bf9\u5e94\u7684\u662f\u4ec0\u4e48\u6587\u4ef6\uff1f \u6211\u770b\u6709\u7684 tool\uff0c\u6bd4\u5982\uff0cbeyondcompare\uff0c\u597d\u50cf\u542b\u4e49\u6709\u70b9\u4e0d\u4e00\u6837\u3002\u6211\u4e0d\u77e5\u9053\u662f\u4e0d\u662f\u8bbe\u7f6e\u4e0a\u8ff0\u53c2\u6570\u65f6\uff0c\u914d\u7f6e\u9519\u4e86&#8230;&#8230;<\/p>\n<p>\u8c22\u8c22\uff01<\/p>\n<\/p><\/div>\n<div> <b>\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (<span>0<\/span>)        <\/div>\n<div> <\/div>\n<\/p><\/div>\n<\/p><\/div>\n<ul>\n<li>\n","protected":false},"excerpt":{"rendered":"<p>\u8bf7\u95ee\u4e00\u4e0b\uff0c\u4e00\u822c mergetool&hellip;<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[],"tags":[],"_links":{"self":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/225932"}],"collection":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=225932"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/225932\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=225932"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=225932"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=225932"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}