5 More Discussions You Might Find Interesting
1. UNIX for Beginners Questions & Answers
Hello All,
Wasn't sure if I was supposed to post this under Hardware so posting here...
Device: CuBox-i
OS: OpenSuSE 13.1
Uname: Linux CuBox-PC 3.14.14-cubox-i #1 SMP Sat Sep 13 03:48:24 UTC 2014 armv7l armv7l armv7l GNU/Linux
Window Manager: XFCE
Display Manager: lightdm (*XDM?)
I... (2 Replies)
Discussion started by: mrm5102
2 Replies
2. Linux
Dear all
I install Cent OS 5.5 ( Linux OS), with bshell and also Windows OS on the my laptop (ASUA) maximum screen resolution in Windows OS is 1024*760 but in Cent OS 5.5 is 800 *600, I have a program that is necessary to install on Cent OS and I have problem with other Linux distributions... (2 Replies)
Discussion started by: mkhorami76
2 Replies
3. Debian
Hi gurus I have notebook with connected external monitor. output of my xrandr looks like
Screen 0: minimum 320 x 200, current 2960 x 1050, maximum 2960 x 1050
VGA connected 1680x1050+1280+0 (normal left inverted right x axis y axis) 478mm x 300mm
1680x1050 60.0*+
1280x1024 ... (2 Replies)
Discussion started by: wakatana
2 Replies
4. Solaris
Hi,
I would like to know how to change the display resolution in solaris on sparc.
Can anyone please help me.
Regards,
Raja (3 Replies)
Discussion started by: RajaRC
3 Replies
5. UNIX Desktop Questions & Answers
Hello
I want change my CRT resolution from 1152x900x** to 1280x1024x75 on a Solaris platform but I try "/usr/sbin/m64config" and "/usr/sbin/ffbconfig" command, the both commands failed :-(
In the /dev/fbs/ directory there is juste one file : cgsix0
have you got a solution to my customer... (1 Reply)
Discussion started by: ggenevrier
1 Replies
LEARN ABOUT XFREE86
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. This is the default if the merge resolution program is explicitly
specified with the --tool option or with the merge.tool configuration variable.
--prompt
Prompt before each invocation of the merge resolution program to give the user a chance to skip the path.
-O<orderfile>
Process files in the order specified in the <orderfile>, which has one shell glob pattern per line. This overrides the diff.orderFile
configuration variable (see git-config(1)). To cancel diff.orderFile, use -O/dev/null.
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 2.17.1 10/05/2018 GIT-MERGETOOL(1)