merge.tool 如何使用 tortoisemerge
cf.
- https://groups.google.com/forum/#!topic/git-for-windows/ktIU6akrCMc
- http://stackoverflow.com/questions/5190188/why-cant-i-use-tortoisemerge-as-my-git-merge-tool-on-windows/15984079#15984079
- https://stackoverflow.com/questions/19819263/git-gui-mergetool-tortoisemerge-wrong-file-path
- https://stackoverflow.com/questions/43317998/git-for-windows-tortoisegitmerge-can-only-be-launched-from-bash-command-line-b
- https://stackoverflow.com/questions/5190188/why-cant-i-use-tortoisemerge-as-my-git-merge-tool-on-windows/15984079#15984079
Edited by username-removed-94717