You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: README.md
+4-4Lines changed: 4 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1,6 +1,6 @@
1
1
# Git LabVIEW Integration
2
2
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).
4
4
5
5
## Usage
6
6
@@ -20,7 +20,7 @@ To get start on Windows, work on Git Bash:
20
20
<tr><td><code>LVCOMPARE_EXECUTABLE</code></td><td>Path to the LVCompare executable<br />
<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
106
106
## Acknowledgements
107
107
108
108
* 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.
0 commit comments