04-12-2016
Also there is "diff -b" if you don't care about tabs, spaces, or trailing spaces not being the same in both files.
For the 2nd part you can create a file with the HEAD thru BODY start and another file to stop body and stop html. With a cat command you can put your generated file between those two and create an instant webpage. You will still need to ftp it to your website.
HTH
This User Gave Thanks to wbport For This Post:
9 More Discussions You Might Find Interesting
1. Programming
Hi, so far i am writting make file explicitly, is there is any tool is there to write make file automatically....if so please tell me about that...
Thanks in advance
Sarwan (4 Replies)
Discussion started by: sarwan
4 Replies
2. UNIX for Dummies Questions & Answers
how to open a text file using some tool such as gedit under gtk
I list some text file names in a GtkCList . I want to open the file on when users click on the row.
How to implement this ?
Thanks (0 Replies)
Discussion started by: cy163
0 Replies
3. UNIX for Advanced & Expert Users
Hi all
I have to compare maps/files on two seperate boxes and the output must be as following:
1)list the maps/file on box1
2)list the maps/file on box2
3)List maps in both the environments
a) which are same
b)which are different
pls any ideas are appreciated
thnks (2 Replies)
Discussion started by: bkan77
2 Replies
4. OS X (Apple)
I need a simple command line executable that allows me to convert a wmv file into an mpg file like this:
wmv2mpg inputfile.mwv > outputfile.mpg
I cannot find it on internet. I tried installing mencoder but I cannot get it to work.
Thanks. (4 Replies)
Discussion started by: karman
4 Replies
5. AIX
which windows tool can burn iso file? The iso file is download from IBM web site for HMC upgrade.
How to burn this iso file to cd or dvd? (1 Reply)
Discussion started by: rainbow_bean
1 Replies
6. Shell Programming and Scripting
Hi,
I have many files in the source directory but I need to process with the latest timestamp file.
I am using linux operating system. i want extract the file created timestamp( Ext_File_create_date=)
With this format YYYYMMDD-
i have searched the relevent command in the unix forms but did... (5 Replies)
Discussion started by: onesuri
5 Replies
7. Shell Programming and Scripting
Dear all
Would anyone tell me how to prevent user from input non asterisk(i.e. *) character via keyboard?
#!/bin/ksh
targetHour=-1
while ]
do
echo "Please input target hour":
read targetHour
done
When I execute the above coding, and then input a "j", it return the following... (3 Replies)
Discussion started by: cstsang
3 Replies
8. UNIX for Dummies Questions & Answers
Hi ,
Please look into the query
1)Date format: mm/dd/yyyy example (10/22/2013)
2) compare this date with the System date
3) if the difference of dates less than 30 days. Then return true otherwise false.
4)commands date-d is not there in my unix version.
5)present version 6
6)using... (7 Replies)
Discussion started by: RaghavendraT
7 Replies
9. UNIX for Beginners Questions & Answers
hi,
I am searching for a native tool on MacOS that can increase the resolution of a group of image files whose aspect ratios (file width versus height) vary widely. There are numerous files so I don't wish to do this manually. Someone suggested the sips command with the resampling option but... (5 Replies)
Discussion started by: Godtookapicture
5 Replies
LEARN ABOUT LINUX
git-mergetool
GIT-MERGETOOL(1) Git Manual GIT-MERGETOOL(1)
NAME
git-mergetool - Run merge conflict resolution tools to resolve merge conflicts
SYNOPSIS
git mergetool [--tool=<tool>] [-y | --[no-]prompt] [<file>...]
DESCRIPTION
Use git mergetool to run one of several merge utilities to resolve merge conflicts. It is typically run after git merge.
If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file (skipping those without
conflicts). Specifying a directory will include all unresolved files in that path. If no <file> names are specified, git mergetool will run
the merge tool program on every file with merge conflicts.
OPTIONS
-t <tool>, --tool=<tool>
Use the merge resolution program specified by <tool>. Valid values include emerge, gvimdiff, kdiff3, meld, vimdiff, and tortoisemerge.
Run git mergetool --tool-help for the list of valid <tool> settings.
If a merge resolution program is not specified, git mergetool will use the configuration variable merge.tool. If the configuration
variable merge.tool is not set, git mergetool will pick a suitable default.
You can explicitly provide a full path to the tool by setting the configuration variable mergetool.<tool>.path. For example, you can
configure the absolute path to kdiff3 by setting mergetool.kdiff3.path. Otherwise, git mergetool assumes the tool is available in PATH.
Instead of running one of the known merge tool programs, git mergetool can be customized to run an alternative program by specifying
the command line to invoke in a configuration variable mergetool.<tool>.cmd.
When git mergetool is invoked with this tool (either through the -t or --tool option or the merge.tool configuration variable) the
configured command line will be invoked with $BASE set to the name of a temporary file containing the common base for the merge, if
available; $LOCAL set to the name of a temporary file containing the contents of the file on the current branch; $REMOTE set to the
name of a temporary file containing the contents of the file to be merged, and $MERGED set to the name of the file to which the merge
tool should write the result of the merge resolution.
If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable
mergetool.<tool>.trustExitCode can be set to true. Otherwise, git mergetool will prompt the user to indicate the success of the
resolution after the custom tool has exited.
--tool-help
Print a list of merge tools that may be used with --tool.
-y, --no-prompt
Don't prompt before each invocation of the merge resolution program.
--prompt
Prompt before each invocation of the merge resolution program. This is the default behaviour; the option is provided to override any
configuration settings.
TEMPORARY FILES
git mergetool creates *.orig backup files while resolving merges. These are safe to remove once a file has been merged and its git
mergetool session has completed.
Setting the mergetool.keepBackup configuration variable to false causes git mergetool to automatically remove the backup as files are
successfully merged.
GIT
Part of the git(1) suite
Git 1.8.5.3 01/14/2014 GIT-MERGETOOL(1)