<ruby id="bdb3f"></ruby>

    <p id="bdb3f"><cite id="bdb3f"></cite></p>

      

      <p id="bdb3f"><cite id="bdb3f"><th id="bdb3f"></th></cite></p><p id="bdb3f"></p>
        <p id="bdb3f"><cite id="bdb3f"></cite></p>
          

          <pre id="bdb3f"></pre>
          <pre id="bdb3f"><del id="bdb3f"><thead id="bdb3f"></thead></del></pre>
          

          <ruby id="bdb3f"><mark id="bdb3f"></mark></ruby><ruby id="bdb3f"></ruby>
          <pre id="bdb3f"><pre id="bdb3f"><mark id="bdb3f"></mark></pre></pre><output id="bdb3f"></output><p id="bdb3f"></p><p id="bdb3f"></p>
          

          <pre id="bdb3f"><del id="bdb3f"><progress id="bdb3f"></progress></del></pre>
                <ruby id="bdb3f"></ruby>
                
    


                
  
                                            
                                                                      
        
                
          ThinkChat2.0新版上線，更智能更精彩，支持會話、畫圖、視頻、閱讀、搜索等，送10W Token，即刻開啟你的AI之旅
          廣告
        
                        
                              
  

                

                
    
                
        
                
                            [TOC]

> [參考](https://kinboyw.github.io/2018/10/09/Use-Vimdiff-As-Git-Mergetool/)

## 概述
使用vimdiff作為`git mergetool`

效果
![](https://img.kancloud.cn/b7/69/b769bea02625591ac4be2b4803f6e5bf_967x500.png)

從左至右，從上到下：
- LOCAL - 這個文件來自當前分支；
- BASE - 兩個分支的共同祖先，在兩個分支上的文件改變之前的樣子；
- REMOTE - 要合并到你當前分支的外部分支上的文件；MERGED - 合并結果，將會保存到本地repo中

## 配置
```
git config --global  merge.tool vimdiff
git config --global  merge.conflictstyle diff3
git config --global mergetool.prompt false
```

## 使用
```
> git merge octodog  # merge octodog into master
Auto-merging animals.txt
CONFLICT (content): Merge conflict in animals.txt
Automatic merge failed; fix conflicts and then commit the result.

> git mergetool

```
                    
                
        
                
            
        
                
    
                
    
                
        
                
    
                

                







                  <ruby id="bdb3f"></ruby>
                  <p id="bdb3f"><cite id="bdb3f"></cite></p>
                    

                    <p id="bdb3f"><cite id="bdb3f"><th id="bdb3f"></th></cite></p><p id="bdb3f"></p>
                      <p id="bdb3f"><cite id="bdb3f"></cite></p>
                        

                        <pre id="bdb3f"></pre>
                        <pre id="bdb3f"><del id="bdb3f"><thead id="bdb3f"></thead></del></pre>
                        

                        <ruby id="bdb3f"><mark id="bdb3f"></mark></ruby><ruby id="bdb3f"></ruby>
                        <pre id="bdb3f"><pre id="bdb3f"><mark id="bdb3f"></mark></pre></pre><output id="bdb3f"></output><p id="bdb3f"></p><p id="bdb3f"></p>
                        

                        <pre id="bdb3f"><del id="bdb3f"><progress id="bdb3f"></progress></del></pre>
                              <ruby id="bdb3f"></ruby>
                              

哎呀哎呀视频在线观看