通常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 –