Skip to content

Commit c350fdf

Browse files
committed
treewide: fix cases LvMerge -> LVMerge
1 parent 6f95cf1 commit c350fdf

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Git LabVIEW Integration
22

3-
This repository provides Bash wrappers for local LVCompare and LvMerge executables to be used in both Windows and POSIX(-like) environments (Mac and Linux).
3+
This repository provides Bash wrappers for local LVCompare and LVMerge executables to be used in both Windows and POSIX(-like) environments (Mac and Linux).
44

55
## Usage
66

@@ -20,7 +20,7 @@ To get start on Windows, work on Git Bash:
2020
<tr><td><code>LVCOMPARE_EXECUTABLE</code></td><td>Path to the LVCompare executable<br />
2121
For 32-bit version on Windows, it would be<br />
2222
<code>C:\Program Files (x86)\National Instruments\Shared\LabVIEW Compare\LVCompare.exe</code></td></tr>
23-
<tr><td><code>LVMERGE_EXECUTABLE</code></td><td>Path to the LvMerge executable<br />
23+
<tr><td><code>LVMERGE_EXECUTABLE</code></td><td>Path to the LVMerge executable<br />
2424
For 32-bit version on Windows, it would be<br />
2525
<code>C:\Program Files (x86)\National Instruments\Shared\LabVIEW Merge\LVMerge.exe</code></td></tr>
2626
<tr><td><code>CONFIG_DIRECTORY_LEVEL</code></td><td>Level of directory from the project root to this configuration file.<br />
@@ -106,8 +106,8 @@ The configuration steps are the same in POSIX environments, plus the executable
106106
## Acknowledgements
107107

108108
* Special thanks go to Jörg Herzinger, Joe Friedrichsen and contributers of the project [joerg/LabViewGitEnv](https://github.com/joerg/LabViewGitEnv).\
109-
The project also works on making LVCompare and LvMerge available Git.
110-
Their work enhanced my understanding to LVCompare, LvMerge, git-difftool and git-mergetool, and inspired me to make this one.
109+
The project also works on making LVCompare and LVMerge available Git.
110+
Their work enhanced my understanding to LVCompare, LVMerge, git-difftool and git-mergetool, and inspired me to make this one.
111111

112112
## Copyright
113113

git-labview-integration-posix/labview_path_posix.config.default

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABVIEW_EXECUTABLE="$(command -v LabVIEW)"
77
## LVCompare executable absolute path
88
LVCOMPARE_EXECUTABLE="$(command -v LVCompare)"
99

10-
## LvMerge executable absolute path
10+
## LVMerge executable absolute path
1111
LVMERGE_EXECUTABLE="$(command -v LVMerge)"
1212

1313
## The location of this script. DO NOT EDIT.

git-labview-integration-windows/labview_path_windows.config.default

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LABVIEW_EXECUTABLE='C:\Program Files (x86)\National Instruments\LabVIEW 2020\Lab
44
## LVCompare executable absolute path
55
LVCOMPARE_EXECUTABLE='C:\Program Files (x86)\National Instruments\Shared\LabVIEW Compare\LVCompare.exe'
66

7-
## LvMerge executable absolute path
7+
## LVMerge executable absolute path
88
LVMERGE_EXECUTABLE='C:\Program Files (x86)\National Instruments\Shared\LabVIEW Merge\LVMerge.exe'
99

1010
## The location of this script. DO NOT EDIT.

0 commit comments

Comments
 (0)