diff --git a/NEWS.adoc b/NEWS.adoc
index f8e3f0665..b11cf8596 100644
--- a/NEWS.adoc
+++ b/NEWS.adoc
@@ -37,6 +37,7 @@ Improvements:
  - Add `:goto <rev>` prompt command to go to a `git-rev-parse`d revision, e.g.
    `:goto some/branch` or `:goto %(commit)^2`.
  - Respect the XDG standard for configuration files. (GH #513)
+ - Resolve diff paths when `diff.noprefix` is true. (GH #487, #488)
  - Support for custom `strftime(3)` date formats, e.g.:
 
 	set main-view-date = custom
diff --git a/include/tig/options.h b/include/tig/options.h
index 8933acf2a..8c205eef5 100644
--- a/include/tig/options.h
+++ b/include/tig/options.h
@@ -36,6 +36,7 @@ typedef struct view_column *view_settings;
 	_(blob_view,			view_settings,		VIEW_NO_FLAGS) \
 	_(commit_order,			enum commit_order,	VIEW_LOG_LIKE) \
 	_(diff_context,			int,			VIEW_DIFF_LIKE) \
+	_(diff_noprefix,		bool,			VIEW_NO_FLAGS) \
 	_(diff_options,			const char **,		VIEW_DIFF_LIKE) \
 	_(diff_view,			view_settings,		VIEW_NO_FLAGS) \
 	_(editor_line_number,		bool,			VIEW_NO_FLAGS) \
diff --git a/src/diff.c b/src/diff.c
index b85cb71c2..f3f2c2d27 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -528,9 +528,18 @@ diff_get_pathname(struct view *view, struct line *line)
 {
 	const struct line *header;
 	const char *dst = NULL;
-	const char *prefixes[] = { " b/", "cc ", "combined " };
+	const char *prefixes[] = { " b/", "diff --cc ", "diff --combined " };
 	int i;
 
+	if (opt_diff_noprefix) {
+		header = find_prev_line_by_type(view, line, LINE_DIFF_ADD_FILE);
+		if (!header)
+			return NULL;
+
+		dst = strstr(box_text(header), "+++ ");
+		return dst ? dst + 4 : NULL;
+	}
+
 	header = find_prev_line_by_type(view, line, LINE_DIFF_HEADER);
 	if (!header)
 		return NULL;
diff --git a/src/options.c b/src/options.c
index 8b02a8599..d4e94354e 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1395,6 +1395,9 @@ read_repo_config_option(char *name, size_t namelen, char *value, size_t valuelen
 	else if (!strcmp(name, "core.abbrev"))
 		parse_int(&opt_id_width, value, 0, SIZEOF_REV - 1);
 
+	else if (!strcmp(name, "diff.noprefix"))
+		parse_bool(&opt_diff_noprefix, value);
+
 	else if (!prefixcmp(name, "tig.color."))
 		set_repo_config_option(name + 10, value, option_color_command);
 
diff --git a/test/diff/editor-test b/test/diff/editor-test
index c1742485e..a1db62f8c 100755
--- a/test/diff/editor-test
+++ b/test/diff/editor-test
@@ -3,25 +3,102 @@
 . libtest.sh
 . libgit.sh
 
-steps '
-	:set line-graphics = ascii
-	:set diff-view-line-number = yes
+tigrc <<EOF
+set line-graphics = ascii
+set diff-view-line-number = yes
+set stage-view-line-number = yes
+EOF
+
+in_work_dir create_repo_from_tgz "$base_dir/files/scala-js-benchmarks.tgz"
 
+script='
 	:210
 	:scroll-line-down
-	:save-display diff-default.screen
 
+	:210
+	:save-display diff-mnemonic.screen
 	:edit
 
 	:224
 	:exec !vim +%(lineno) %(file)
 '
 
-in_work_dir create_repo_from_tgz "$base_dir/files/scala-js-benchmarks.tgz"
+test_case default \
+ --args='show ee912870202200a0b9cf4fd86ba57243212d341e' \
+ --script="$script" <<EOF
+   | -  )                                                                       
+   | -                                                                          
+   |    lazy val parent: Project = Project(                                     
+200|        id = "parent",                                                      
+   |        base = file("."),                                                   
+   | @@ -53,10 +48,10 @@ object ScalaJSBenchmarks extends Build {               
+   |    )                                                                       
+   |                                                                            
+205|    lazy val common = project("Common", defaultSettings)                    
+   | -  lazy val deltablue = project("DeltaBlue", benchmarkSettings).dependsOn(c
+   | -  lazy val richards = project("Richards", benchmarkSettings).dependsOn(com
+   | -  lazy val sudoku = project("Sudoku", benchmarkSettings).dependsOn(common)
+   | -  lazy val tracer = project("Tracer", benchmarkSettings).dependsOn(common)
+210| +  lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(com
+   | +  lazy val richards = project("Richards", defaultSettings).dependsOn(commo
+   | +  lazy val sudoku = project("Sudoku", defaultSettings).dependsOn(common)  
+   | +  lazy val tracer = project("Tracer", defaultSettings).dependsOn(common)  
+   |                                                                            
+215|    def project(id: String, settings: Seq[sbt.Def.Setting[_]]) = Project(   
+   |        id = id.toLowerCase,                                                
+   | diff --git a/project/build.sbt b/project/build.sbt                             
+   | index 87c2e66..122abd0 100644                                              
+   | --- a/project/build.sbt                                                      
+220| +++ b/project/build.sbt                                                      
+   | @@ -1 +1,4 @@                                                              
+   | -addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.
+   | +resolvers += Resolver.url("scala-js-snapshots",                           
+   | +    url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatt
+[diff] Changes to 'project/build.sbt' - line 224 of 367                    61%
+EOF
 
-test_tig show ee912870202200a0b9cf4fd86ba57243212d341e
+# This settings doesn't seem to apply to `git-show`
+test_case mnemonic \
+ --args='show ee912870202200a0b9cf4fd86ba57243212d341e' \
+ --before='git config diff.mnemonicPrefix true' \
+ --after='git config diff.mnemonicPrefix false' \
+ --script="$script" << EOF
+   | -  )                                                                       
+   | -                                                                          
+   |    lazy val parent: Project = Project(                                     
+200|        id = "parent",                                                      
+   |        base = file("."),                                                   
+   | @@ -53,10 +48,10 @@ object ScalaJSBenchmarks extends Build {               
+   |    )                                                                       
+   |                                                                            
+205|    lazy val common = project("Common", defaultSettings)                    
+   | -  lazy val deltablue = project("DeltaBlue", benchmarkSettings).dependsOn(c
+   | -  lazy val richards = project("Richards", benchmarkSettings).dependsOn(com
+   | -  lazy val sudoku = project("Sudoku", benchmarkSettings).dependsOn(common)
+   | -  lazy val tracer = project("Tracer", benchmarkSettings).dependsOn(common)
+210| +  lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(com
+   | +  lazy val richards = project("Richards", defaultSettings).dependsOn(commo
+   | +  lazy val sudoku = project("Sudoku", defaultSettings).dependsOn(common)  
+   | +  lazy val tracer = project("Tracer", defaultSettings).dependsOn(common)  
+   |                                                                            
+215|    def project(id: String, settings: Seq[sbt.Def.Setting[_]]) = Project(   
+   |        id = id.toLowerCase,                                                
+   | diff --git a/project/build.sbt b/project/build.sbt                             
+   | index 87c2e66..122abd0 100644                                              
+   | --- a/project/build.sbt                                                      
+220| +++ b/project/build.sbt                                                      
+   | @@ -1 +1,4 @@                                                              
+   | -addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.
+   | +resolvers += Resolver.url("scala-js-snapshots",                           
+   | +    url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatt
+[diff] Changes to 'project/build.sbt' - line 224 of 367                    61%
+EOF
 
-assert_equals 'diff-default.screen' <<EOF
+test_case noprefix \
+ --args='show ee912870202200a0b9cf4fd86ba57243212d341e' \
+ --before='git config diff.noprefix true' \
+ --after='git config diff.noprefix false' \
+ --script="$script" << EOF
    | -  )                                                                       
    | -                                                                          
    |    lazy val parent: Project = Project(                                     
@@ -42,20 +119,75 @@ assert_equals 'diff-default.screen' <<EOF
    |                                                                            
 215|    def project(id: String, settings: Seq[sbt.Def.Setting[_]]) = Project(   
    |        id = id.toLowerCase,                                                
-   | diff --git a/project/build.sbt b/project/build.sbt                         
+   | diff --git project/build.sbt project/build.sbt                             
    | index 87c2e66..122abd0 100644                                              
-   | --- a/project/build.sbt                                                    
-220| +++ b/project/build.sbt                                                    
+   | --- project/build.sbt                                                      
+220| +++ project/build.sbt                                                      
    | @@ -1 +1,4 @@                                                              
    | -addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.
    | +resolvers += Resolver.url("scala-js-snapshots",                           
    | +    url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatt
-[diff] Changes to 'project/Build.scala' - line 210 of 367                    61%
+[diff] Changes to 'project/build.sbt' - line 224 of 367                    61%
 EOF
 
+test_case conflict \
+ --before='setup-conflict.sh > config.setup' \
+ --script='
+ 	:view-diff
+	:7
+	:edit
+
+	:10
+	:exec !vim +%(lineno) %(file)
+' << EOF
+  1| diff --cc conflict-file                                                    
+   | index 86c5a05,b4c3de6..0000000                                             
+   | --- a/conflict-file                                                        
+   | +++ b/conflict-file                                                        
+  5| @@@ -1,1 -1,1 +1,5 @@@                                                     
+   | ++<<<<<<< HEAD                                                             
+   |  +c'                                                                       
+   | ++=======                                                                  
+   | + d'                                                                       
+ 10| ++>>>>>>> conflict-branch                                                  
+                                                                                
+                                                                                
+                                                                                
+                                                                                
+                                                                                
+                                                                                
+                                                                                
+                                                                                
+                                                                                
+                                                                                
+                                                                                
+                                                                                
+                                                                                
+                                                                                
+                                                                                
+                                                                                
+                                                                                
+                                                                                
+[stage] Unstaged changes to 'conflict-file' - line 10 of 10                 100%
+EOF
+
+run_test_cases
+
 assert_equals 'editor.log' <<EOF
 +51 project/Build.scala
   lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(common)
 +2 project/build.sbt
     url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
++51 project/Build.scala
+  lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(common)
++2 project/build.sbt
+    url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
++51 project/Build.scala
+  lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(common)
++2 project/build.sbt
+    url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
++2 conflict-file
+c'
++5 conflict-file
+>>>>>>> conflict-branch
 EOF
diff --git a/test/tools/libtest.sh b/test/tools/libtest.sh
index 96cc5914c..74972d692 100644
--- a/test/tools/libtest.sh
+++ b/test/tools/libtest.sh
@@ -105,7 +105,7 @@ if [ -n "\$lineno" ]; then
 fi
 
 echo "\$@" >> "$HOME/editor.log"
-sed -n -e "\${lineno}p" "\$file" >> "$HOME/editor.log"
+sed -n -e "\${lineno}p" "\$file" >> "$HOME/editor.log" 2>&1
 EOF
 
 cd "$output_dir"
@@ -503,7 +503,7 @@ run_test_cases()
 	test_setup
 	for name in $(cat test-cases); do
 		tig_script "$name" "
-			$(if [ -e "$name.script" ]; then cat "$name.script"; fi)
+			$(if [ -e "$name-script" ]; then cat "$name-script"; fi)
 			:save-display $name.screen
 		"
 		if [ -e "$name-before" ]; then
@@ -513,7 +513,10 @@ run_test_cases()
 		if [ -e "$name-cwd" ]; then
 			work_dir="$work_dir/$(cat "$name-cwd")"
 		fi
+		ORIG_IFS="$IFS"
+	        IFS=$' '
 		test_tig $(if [ -e "$name-args" ]; then cat "$name-args"; fi)
+	        IFS="$ORIG_IFS"
 		work_dir="$old_work_dir"
 		if [ -e "$name-after" ]; then
 			test_exec_work_dir "$SHELL" "$HOME/$name-after"