03-06-2002
Sax or sax2
Hi there!
when youre in a terminal, type sax or sax2 and ENTER, then youll come to a configuration tool.
10 More Discussions You Might Find Interesting
1. UNIX for Advanced & Expert Users
We have 2 Unix boxes.
AIX 4.3 RS/6000
Linux RedHat 6.1 Intel
There is a name server running on the linux machine. This is not used on the AIX machine ( it simply uses /etc/hosts ).
Now i have rsh permission denied problems and i suspect our AIX and tcp/ip name resolution.
I was told to... (2 Replies)
Discussion started by: progressdll
2 Replies
2. UNIX for Advanced & Expert Users
My machine (Sun Blade 100) has just had it's OS reinstalled (solaris 8). For some reason the monitor resolution has changed (decreaded so that I have less monitor real esate).
Does anybody know the command to change monitor resolution in Solaris?
Cheers
AreaMan (2 Replies)
Discussion started by: AreaMan
2 Replies
3. UNIX for Advanced & Expert Users
Guys,
We are going to order the wide screen monitor with 1920*1200 resolution for one U60 in our client side, that their current graphic card is Elite3D-m6 and the higher resolution which this card supports is 1280*1024.
I just want to make sure wehther we are able to work with this monitor via... (1 Reply)
Discussion started by: nikk
1 Replies
4. Solaris
Hi,
I got solaris 10 installed on a E250 and i am expericing issues resolving dns.
from some research i think it's becuase where i haven't set-up NIS and i don't intend too as i am just setting up a box to poke communigate pro.
Any help or advice please?
Thanks in advance
Alan (1 Reply)
Discussion started by: e250user
1 Replies
5. IP Networking
I have an AIX4.3 box on our subnet, called LIMEST3.OURDOMAIN.CO.UK, with IP address 10.103.1.13
It has the following entry in its own /etc/hosts:
10.103.1.13 limest3 limest3.ourdomain.co.uk
Now, if I ping limest3.ourdomain.co.uk or ping 10.103.1.13, the result is instant. However if I ping... (4 Replies)
Discussion started by: grimbleshanks
4 Replies
6. Solaris
Hi friends, i had small problem in my home pc i install solaris 10 but GUI is very big cannot view any thing, but i can open terminal where with very difficulty is there any command to re size my resolution some thing like 1024. if not i want to log in default console other than GUI only terminal... (5 Replies)
Discussion started by: kurva
5 Replies
7. Solaris
how to change screen resolution in CDE prompt (2 Replies)
Discussion started by: tirupathi
2 Replies
8. Red Hat
hi all
after going through ext3 file system , i understood that data resolution for ext3 FS is 1 second...can i increase it 2 second...? any idea..? (3 Replies)
Discussion started by: sagar_md
3 Replies
9. Solaris
Hi all. I have a very peculiar problem in Solaris 10. The output of the m64config -prconf command with regards the Card Adapter is the following.
Card possible resolutions: 720x400x85, 640x480x60, 640x480x72, 640x480x75
800x600x56, 800x600x60, 800x600x72, 800x600x75, 1024x768x60
... (0 Replies)
Discussion started by: lynxman
0 Replies
10. Windows & DOS: Issues & Discussions
Hello guys,
At windows 7, when multiple ip addresses used on one nic, starting "network" from desktop is able to resolve samba machine's name (freebsd + samba3.5.9 from ports) but does not want to open machine (error: unexisting) nor ping it by name. Works fine if specified by ipv4/ipv6 address... (2 Replies)
Discussion started by: hachik
2 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)