diff --git a/README.md b/README.md
index 2a6e9b9..d766842 100644
--- a/README.md
+++ b/README.md
@@ -91,6 +91,7 @@
 * [Status of ignored files.](https://github.com/git-tips/tips#status-of-ignored-files)
 * [Commits in Branch1 that are not in Branch2](https://github.com/git-tips/tips#commits-in-branch1-that-are-not-in-branch2)
 * [reuse recorded resolution, record and reuse previous conflicts resolutions.](https://github.com/git-tips/tips#reuse-recorded-resolution-record-and-reuse-previous-conflicts-resolutions)
+* [Open all conflicted files in an editor.](https://github.com/git-tips/tips#open-all-conflicted-files-in-an-editor)
 
 <!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
 <!-- @doxie.inject end toc -->
@@ -629,5 +630,10 @@ git log Branch1 ^Branch2
 git config --global rerere.enabled 1
 ```
 
+## Open all conflicted files in an editor.
+```sh
+git diff --name-only | uniq | xargs $EDITOR
+```
+
 <!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
 <!-- @doxie.inject end -->
diff --git a/tips.json b/tips.json
index 5d8c0e8..03283a2 100644
--- a/tips.json
+++ b/tips.json
@@ -278,4 +278,7 @@
 }, {
 	"title": "reuse recorded resolution, record and reuse previous conflicts resolutions.",
 	"tip":"git config --global rerere.enabled 1"
+},{
+	"title": "Open all conflicted files in an editor.",
+	"tip": "git diff --name-only | uniq | xargs $EDITOR"
 }]