12-23-2019
Quote:
Yes, you did everyone correctly.
Let me think about it and get back to you later.
Thanks.
sure !! If there is a different tool that can help we can take that approach as well to resolve the issue.
10 More Discussions You Might Find Interesting
1. Shell Programming and Scripting
Hw to change the font color and size of output in perl (2 Replies)
Discussion started by: trupti_rinku
2 Replies
2. Shell Programming and Scripting
Could you pls tell me how to change the font colour in unix ?
What is the syntax ? (3 Replies)
Discussion started by: sars
3 Replies
3. Shell Programming and Scripting
Does anyone know how can I change font color, background color etc for a particular user using .profile? Any help is appreciated. (0 Replies)
Discussion started by: fifo_vs_lifo23
0 Replies
4. UNIX for Dummies Questions & Answers
Hi Gurus,
I have a small requirement where i want to change the color & font of some text in a file.
i have a file error.txt which will be created in the script using egrep.
After that iam adding these lines at head & tail to that file using the following code
awk 'BEGIN{print"Please... (4 Replies)
Discussion started by: pssandeep
4 Replies
5. Shell Programming and Scripting
I am writing sql reports to an oracle database, spooling them to a file and emailing them with mailx. I use the syntax below. The reports do not format properly, unless I use the Courier New font. How do I set this with mailx?
mailx -s "MY REPORT, `date +'%D %r` " -r "REPORTING SYSTEM"... (2 Replies)
Discussion started by: guessingo
2 Replies
6. Shell Programming and Scripting
Hello All,
Wasn't sure if this was the correct thread to post this under but figured it has to do with Perl and Gtk2 so why not...
Anyway.. How can I find out what the Default font being used is inside a Gtk2::Widget. In this case I'm trying to figure out the
font being used inside a... (1 Reply)
Discussion started by: mrm5102
1 Replies
7. Programming
Does anyone know how to change the font size into a larger one, in a basic Motif application? (1 Reply)
Discussion started by: JenniferKuiper
1 Replies
8. UNIX for Dummies Questions & Answers
how do i change from employee= to employee= in ksh.
in my shell script, i just want to employee= to BOLD. (3 Replies)
Discussion started by: lawsongeek
3 Replies
9. Ubuntu
Hello,
I have a problem with Greek subtitle font size when I map a subtitle file into a video in ffmpeg.
I ran below code:
ffmpeg -i video.mp4 -sub_charenc CP1253 -i video_sub.srt -c:v copy -c:a copy \
-c:s mov_text -metadata:s:s:0 language=gr mapped_video.mp4
When I play it in VLC,... (2 Replies)
Discussion started by: baris35
2 Replies
10. UNIX for Beginners Questions & Answers
Hi All,
I have a file that contains following entries.
I want to highlight the line that has word as "FAILURE" while sending the email.
File
------------------------------------------------------------
Job Name: ABC
Start Time: 07/20/2019 07:32:39
End Time: 07/20/2019... (4 Replies)
Discussion started by: sdosanjh
4 Replies
LEARN ABOUT SUSE
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|--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. 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 merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
ecmerge, diffuse, tortoisemerge, opendiff, p4merge and araxis.
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.
-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.
AUTHOR
Written by Theodore Y Ts'o <tytso@mit.edu[1]>
DOCUMENTATION
Documentation by Theodore Y Ts'o.
GIT
Part of the git(1) suite
NOTES
1. tytso@mit.edu
mailto:tytso@mit.edu
Git 1.7.1 07/05/2010 GIT-MERGETOOL(1)