07-22-2008
You should also be able to use gvimdiff as the command.
10 More Discussions You Might Find Interesting
1. Shell Programming and Scripting
Hello,
I want to compare two files. All records in file 2 that are not in file 1 should be output to file 3.
For example:
file 1
123
1234
123456
file 2
123
2345
23456
file 3 should have
2345
23456
I have looked at diff, bdiff, cmp, comm, diff3 without any luck! (2 Replies)
Discussion started by: blt123
2 Replies
2. Shell Programming and Scripting
Hi,
svn diff does not work very well with 2 local folders, so I am trying to do this diff using diff locally.
since there's a bunch of meta files in an svn directory, I want to do a diff that excludes everything EXCEPT *.java files. there seems to be only an --exclude option, so I'm not sure... (3 Replies)
Discussion started by: ackbarr
3 Replies
3. Solaris
Hi Friends
I have a compiler(Sun Forte,I believe) running in my Solaris 9 box.
since y'day my development team is finding this error when they compile:
ld.so.1: expr: fatal: libgmp.so.3: open failed: No such file or directory
I ran a search for this file and found it in one of my file... (2 Replies)
Discussion started by: Hari_Ganesh
2 Replies
4. Shell Programming and Scripting
Hi Everyone,
I am writing a shell script for the below needs and would like your suggestions and advices.
I have a lot of scripting files(Shell Scripts) under the directory:
/home/risk_dev/dev
I have another directory which has a lot of shell scripts under the directory:
... (2 Replies)
Discussion started by: filter
2 Replies
5. Solaris
Hi,
I am new to SVN configuration on Solaris 10.I have installed SVN client version 1.7.
bash-3.00# ./svn --version
svn, version 1.7.4 (r1295709)
compiled Mar 2 2012, 12:59:36
Here my requirement is how to integrate svn client to One of the SVN server repository.
My repository... (0 Replies)
Discussion started by: muraliinfy04
0 Replies
6. Solaris
Hi Guys,
I am facing this Error
bash-2.03$ ./curl -V
ld.so.1: curl: fatal: libldap.so.5: open failed: No such file or directory
Killed
bash-2.03$
while executing
./curl -V in /opt/sfw/bin directory.
I am using Sun Solaris 10.
which package upgrage can give me this missing... (9 Replies)
Discussion started by: manalisharmabe
9 Replies
7. Shell Programming and Scripting
Hi Folks,
I have a directory at /usr/local/aa and there is other directory where I have checkout the code through svn checkout command ( /opt/app/fgh) now I can apply svn log command here as shown below
$ cd /opt/app/fgh
svn checkout <url>
svn log
shows me the log on console .
please... (3 Replies)
Discussion started by: punpun66
3 Replies
8. Shell Programming and Scripting
Hi Folks ,
I am asking this question but i apologise please if this is not the correct forum ,
I have to develop a shell script that i want to place in at hooks/post-commit , that is basically i have to develop a post hook script and the main functionality of that script would be lets say if... (0 Replies)
Discussion started by: sunsun06060606
0 Replies
9. UNIX for Advanced & Expert Users
I'm quite new to SVN and having configured it based on tutorials from youtube etc, I have it setup like below:
* User1 and User2 can commit and update using their own passwords,
* Updates from both user1 and user2 are visible to each other
* files are shared between both user1 and user2
*... (2 Replies)
Discussion started by: busyboy
2 Replies
10. Shell Programming and Scripting
Hi, The below commands works fine on serverB
. /etc/profile;
cd /export/home/user2/utils/plugin/
./runme.shHowever, when i run the same commands from serverA it fails
$ ssh -q user2@serverB ". /etc/profile; cd /export/home/user2/utils/plugin; ./runme.sh"Output Error:
Please find the below... (8 Replies)
Discussion started by: mohtashims
8 Replies
LEARN ABOUT MINIX
vimdiff
VIMDIFF(1) General Commands Manual VIMDIFF(1)
NAME
vimdiff - edit two, three or four versions of a file with Vim and show differences
SYNOPSIS
vimdiff [options] file1 file2 [file3 [file4]]
gvimdiff
DESCRIPTION
Vimdiff starts Vim on two (or three or four) files. Each file gets its own window. The differences between the files are highlighted.
This is a nice way to inspect changes and to move changes from one version to another version of the same file.
See vim(1) for details about Vim itself.
When started as gvimdiff the GUI will be started, if available.
In each window the 'diff' option will be set, which causes the differences to be highlighted.
The 'wrap' and 'scrollbind' options are set to make the text look good.
The 'foldmethod' option is set to "diff", which puts ranges of lines without changes in a fold. 'foldcolumn' is set to two to make it easy
to spot the folds and open or close them.
OPTIONS
Vertical splits are used to align the lines, as if the "-O" argument was used. To use horizontal splits instead, use the "-o" argument.
For all other arguments see vim(1).
SEE ALSO
vim(1)
AUTHOR
Most of Vim was made by Bram Moolenaar, with a lot of help from others. See ":help credits" in Vim.
2001 March 30 VIMDIFF(1)