Make env var name the same as the shell var name

Wilfred · Jul 21, 2024 · c087c66 · c087c66
1 parent 94f04b1
commit c087c66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/manual/src/git.md b/manual/src/git.md
@@ -43,7 +43,7 @@ Add the following to your `~/.gitconfig` to use difftastic as a
         prompt = false
 
 [difftool "difftastic"]
-        cmd = REAL_PATH="$MERGED" difft "$LOCAL" "$REMOTE"
+        cmd = MERGED="$MERGED" difft "$LOCAL" "$REMOTE"
 
 [pager]
         difftool = true

diff --git a/src/options.rs b/src/options.rs
@@ -535,7 +535,7 @@ fn is_git_tmpfile(path: &Path) -> bool {
 fn build_display_path(lhs_path: &FileArgument, rhs_path: &FileArgument) -> String {
     match (lhs_path, rhs_path) {
         (FileArgument::NamedPath(lhs), FileArgument::NamedPath(rhs)) => {
-            if let Ok(path) = env::var("REAL_PATH") {
+            if let Ok(path) = env::var("MERGED") {
                 if !path.is_empty() {
                     return path;
                 }