How do I ignore leading and trailing whitespace in NetBeans when resolving conflicts during a git merge.
Under Option > Miscellaneous > Diff you can set the diff tool to ignore leading an trailing whitespace but this does not take affect in the NetBeans merge tool.
git supports git merge -Xignore-all-space
. Is there as way to pass this flag in NetBeans?
Git Merge and Fixing Mixed Spaces and Tabs with two Branches