Comments on: 使用 vimdiff 作 git 合并工具的技巧 http://linuxtoy.org/archives/merging-with-git.html LinuxTOY 是一个致力于提供 Linux 相关资讯的专题站点。如果您发现了好用好玩的 Linux 东东并愿意发扬自由、分享的精神，可以点击顶部导航 Contact 按钮进行投稿。 Thu, 24 May 2012 17:43:16 +0000 hourly 1 http://wordpress.org/?v=3.3.1 By: adam8157 http://linuxtoy.org/archives/merging-with-git.html#comment-189811 adam8157 Wed, 19 Jan 2011 07:56:26 +0000 http://linuxtoy.org/?p=3100#comment-189811 <p>求用vimdiff作svn合并工具的方法</p> 求用vimdiff作svn合并工具的方法

]]> By: 邱焜 http://linuxtoy.org/archives/merging-with-git.html#comment-114106 邱焜 Fri, 29 May 2009 04:11:17 +0000 http://linuxtoy.org/?p=3100#comment-114106 <p>大家可以跑到vern的github去打劫格式更好的配置文件</p> 大家可以跑到vern的github去打劫格式更好的配置文件

]]> By: Rothsdad http://linuxtoy.org/archives/merging-with-git.html#comment-113956 Rothsdad Wed, 27 May 2009 14:16:12 +0000 http://linuxtoy.org/?p=3100#comment-113956 <p>是manaco字体吗？</p> 是manaco字体吗？

]]> By: aiezue http://linuxtoy.org/archives/merging-with-git.html#comment-113911 aiezue Wed, 27 May 2009 03:33:02 +0000 http://linuxtoy.org/?p=3100#comment-113911 <p>@<a href="#comment-113902" rel="nofollow">marlboromoo</a>: 这个网站忒好了!谢鸟</p> @marlboromoo: 这个网站忒好了!谢鸟

]]> By: marlboromoo http://linuxtoy.org/archives/merging-with-git.html#comment-113902 marlboromoo Wed, 27 May 2009 02:21:40 +0000 http://linuxtoy.org/?p=3100#comment-113902 <p>try this, make ur own wallpaper . http://bgpatterns.com/</p> try this, make ur own wallpaper . http://bgpatterns.com/

]]> By: IanY http://linuxtoy.org/archives/merging-with-git.html#comment-113869 IanY Tue, 26 May 2009 13:05:26 +0000 http://linuxtoy.org/?p=3100#comment-113869 <p>眼花缭乱啊，写个bash脚本来exec应该更清晰</p> 眼花缭乱啊，写个bash脚本来exec应该更清晰

]]> By: gsj987 http://linuxtoy.org/archives/merging-with-git.html#comment-113868 gsj987 Tue, 26 May 2009 13:02:14 +0000 http://linuxtoy.org/?p=3100#comment-113868 <p>壁纸甚好～</p> 壁纸甚好～

]]> By: 邱焜 http://linuxtoy.org/archives/merging-with-git.html#comment-113866 邱焜 Tue, 26 May 2009 12:22:37 +0000 http://linuxtoy.org/?p=3100#comment-113866 <p>不解释大侠</p> 不解释大侠

]]> By: vern http://linuxtoy.org/archives/merging-with-git.html#comment-113861 vern Tue, 26 May 2009 11:14:29 +0000 http://linuxtoy.org/?p=3100#comment-113861 <p>模仿 kdiff3，添加3个快捷键：</p> <p><code> cmd = "vim --noplugin -d \"$PWD/$MERGED\" \ +\":split $PWD/$REMOTE\" +\":set buftype=nowrite\" \ +\":vertical diffsplit $PWD/$LOCAL\" +\":set buftype=nowrite\" \ +\":vertical diffsplit $PWD/$BASE\" +\":set buftype=nowrite\" \ +\":wincmd j\" \ +\":nmap 1 :diffget BASE:diffupdate\" \ +\":nmap 2 :diffget LOCAL:diffupdate\" \ +\":nmap 3 :diffget REMOTE:diffupdate\" " </code></p> <p>@ZH: <a href="http://s5unty.deviantart.com/" rel="nofollow">deviantART</a></p> 模仿 kdiff3，添加3个快捷键：

cmd = "vim --noplugin -d \"$PWD/$MERGED\" \ +\":split $PWD/$REMOTE\" +\":set buftype=nowrite\" \ +\":vertical diffsplit $PWD/$LOCAL\" +\":set buftype=nowrite\" \ +\":vertical diffsplit $PWD/$BASE\" +\":set buftype=nowrite\" \ +\":wincmd j\" \ +\":nmap 1 :diffget BASE:diffupdate\" \ +\":nmap 2 :diffget LOCAL:diffupdate\" \ +\":nmap 3 :diffget REMOTE:diffupdate\" "

@ZH: deviantART

]]> By: ZH http://linuxtoy.org/archives/merging-with-git.html#comment-113857 ZH Tue, 26 May 2009 10:41:47 +0000 http://linuxtoy.org/?p=3100#comment-113857 <p>那张壁纸我苦苦寻找了很久呀！！！ 分享一下吧！</p> 那张壁纸我苦苦寻找了很久呀！！！ 分享一下吧！

]]>