通常git -c merge.tool=gvimdiff mergetool
打開文件由一個被合併的,在批處理模式下:如何使gvimdiff通過git mergetool打開一次在標籤頁中打開所有文件?
Normal merge conflict for '...':
{local}: modified file
{remote}: modified file
4 files to edit
... seems unchanged.
Was the merge successful? [y/n] n
merge of ... failed
Continue merging other unresolved paths (y/n) ? y
Normal merge conflict for '...':
{local}: modified file
{remote}: modified file
4 files to edit
modules ... seems unchanged.
Was the merge successful? [y/n] n
merge of modules ... failed
Continue merging other unresolved paths (y/n) ? n
我如何讓它打開所有文件之一,包含四個窗格玻璃裝置的每個選項卡(如在gvim -p file1 file2
)文件被合併?
相關的difftool:http://stackoverflow.com/questions/1220309/git-difftool-open-all-diff-files-immediately-not-in-serial –