{"width":"100%","height":"190","image_url":null,"description":"2009/5/19\u8ffd\u8a18 mergemaster -U\u306b\u306f\u30d0\u30b0\u304c\u3042\u308b\u304f\u3055\u3044\u3002\u8a73\u7d30\u306f\u3053\u3061\u3089\u3002 \u3044\u3064\u3054\u308d\u304b\u3089\u304b\u3001mergemaster\u306b\u65b0\u3057\u3044\u30aa\u30d7\u30b7\u30e7\u30f3\u304c\u5897\u3048\u305f\u3002 Using the [-F] option mergemaster will install the new file for you if they differ only by VCS strings. -F\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4f7f\u3046\u3068\u3001VCS\u6587\u5b57\u5217\u3060\u3051\u304c\u9055\u3063\u3066\u5185\u5bb9\u306f\u5909\u308f\u3089\u306a\u3044\u30d5\u30a1\u30a4\u30eb\u3092\u81ea\u52d5\u7684\u306b\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u3066\u304f\u308c\u308b\u3068\u306e\u3053\u3068\u3002 \u3053\u3053\u3067\u306eVCS\u6587\u5b57\u5217\u3068\u3044\u3046\u306e\u306f\u3001\u30d5\u30a1\u30a4\u30eb\u306b\u542b\u307e\u308c\u308b\u3053\u3093\u306a\u306e\u3002 # $FreeBSD: src/etc/defaults\u2026","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fflageo.hatenadiary.org%2Fentry%2F20090501%2Fp1\" title=\"mergemaster\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u306f-UPiF\u3067\u3002 - \u6625\u6728\u5c4b\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","categories":["FreeBSD"],"provider_name":"Hatena Blog","type":"rich","published":"2009-05-01 00:00:00","title":"mergemaster\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u306f-UPiF\u3067\u3002","provider_url":"https://hatena.blog","author_name":"flageo","url":"https://flageo.hatenadiary.org/entry/20090501/p1","blog_url":"https://flageo.hatenadiary.org/","version":"1.0","author_url":"https://blog.hatena.ne.jp/flageo/","blog_title":"\u6625\u6728\u5c4b"}