08-09-2008
Hi again!
Well... nmon is great... but is only a tool to monitor... i would like a tool to do benchmarks...
10 More Discussions You Might Find Interesting
1. AIX
Hi all,
I have problem with regards to using pg on AIX v5.3.0.0 . Here wht i am trying to do --- i have shell script with the following statements
if ||
then
echo ^[[?3h
tput clear
pg -f $1$2
echo ^[[?3l
... (0 Replies)
Discussion started by: ramanujapuram
0 Replies
2. UNIX for Advanced & Expert Users
Hello,
I'm working on a AIX5.2 OS. The problem i'm facing is that the system performance is good in rrot login, but when i switch to other users login it is very slow. A ls or even pwd command take almost 20 to 30 sec to disply output.
The same logins are working fine on other... (2 Replies)
Discussion started by: pradeepmacha
2 Replies
3. Programming
When compiling (a simple test program):
#include <stdio.h>
#include <sys/context.h>
int main() {
printf("Hello\n");
return 0;
}
on AIX 5.2 with gcc 3.2.2 from the IBM site I get the following error:
/usr/include/sys/context.h:169: parse error before "sigset64_t"... (4 Replies)
Discussion started by: rein
4 Replies
4. AIX
Can somebody help me. Whenever I telnet to my server i received a message
/dev/pts/0: 3004-004 You must "exec" login from the lowest login shell.
Connection closed.
pls help me (2 Replies)
Discussion started by: vjm
2 Replies
5. AIX
Dear Frndz,
I have a problem in automount.
please find the config file entry for automount /etc/auto_master
/- /mount.map
I have specified all the mappings in /mount.map
The service is operative.
But when i cd into the directory it is not mounting with the server.
Could you... (6 Replies)
Discussion started by: sriram.s
6 Replies
6. AIX
I downloaded gcc-cplusplus-4.0.0-1.aix5.2.ppc.rpm from IBM AIX Toolbox Download Page - Alphabetical Listing
but:
-bash-3.00# rpm -ivh gcc-cplusplus-4.0.0-1.aix5.2.ppc.rpm
error: gcc-cplusplus-4.0.0-1.aix5.2.ppc.rpm cannot be installed
I can't understand wht kind of error is it... Can be... (1 Reply)
Discussion started by: untamed
1 Replies
7. AIX
Dear ALL.
I installed AIX OS on customer sites.
but Only one site is too slow when I connected telnet, ftp..
Ping is too fast. but telnet and FTP is not connected..
of course i check the configuration file on aix but it's normal.
Do any Idea??
thanks in advance.
- Jun - (3 Replies)
Discussion started by: Jeon Jun Seok
3 Replies
8. AIX
I have updated the TL levels in a step upgrade from TL4-TL6 (oslevel -r --> 5300-06) without any issues.
However when I try to install TL7, it fails on package dependencies. It seems that TL7 may have introduced some major device enhancements, so how do I update from TL6 to TL7?
I have... (6 Replies)
Discussion started by: mrmurdock
6 Replies
9. AIX
while i was trying to apply the patch IZ86736 in TL6_SP1 its give me the below error
instfix -d . -p -f /tmp/.instfix_selections.20512908 > File
installp -acgNqXd . -f File
File:
bos.rte.control 06.01.0006.0003
... (3 Replies)
Discussion started by: thecobra151
3 Replies
10. UNIX for Advanced & Expert Users
Hi Unix Experts,
I have seen with AIX, that sometimes my new libraries are not picked up by executable. This could be the problem of "loader domain" on AIX.
As I found on below link AIX libraries do stick in the memory.
AIX shared libraries
The remedy for this is to run slibclean... (3 Replies)
Discussion started by: shriashishpatil
3 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)