1

通常git -c merge.tool=gvimdiff mergetool、マージするファイルを 1 つずつバッチ モードで開きます。

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マージする各ファイルの 4 つのペイン配置を含むタブ ( のような) を使用して、すべてのファイルを一度に開くにはどうすればよいですか?

4

1 に答える 1