compare three files line by line NAME diff3 - compare three files line by line SYNOPSIS diff3 [ OPTION ]... MYFILE OLDFILE YOURFILE D......name>]]] [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>] [--[no-]diff3] [--object-id] <current> <base> <other> DESCRIPTION Given three files <current> ,…...redistribute it. There is NO WARRANTY, to the extent permitted by law. SEE ALSO diff (1), diff3 (1), sdiff (1) The full documentation for cmp is maintained as a Texinfo manual. …...ute it. There is NO WARRANTY, to the extent permitted by law. SEE ALSO cmp (1), diff (1), diff3 (1) The full documentation for sdiff is maintained as a Texinfo manual. If the in…...ve style can be used by setting the merge.conflictStyle configuration variable to either "diff3" or "zdiff3". In "diff3" style, the above conflict may look like this: Here are l…...ing the configuration file and stashing it in a cache area during registration, and using diff3 during the install (the stashed file name is a munged version of the full path of…...te it. There is NO WARRANTY, to the extent permitted by law. SEE ALSO wdiff (1), cmp (1), diff3 (1), sdiff (1), patch (1) The full documentation for diff is maintained as a Texi…...g the merge.conflictStyle configuration variable. Possible values are "merge" (default), "diff3", and "zdiff3". --ignore-unmerged When restoring files on the working tree from t…...g the merge.conflictStyle configuration variable. Possible values are "merge" (default), "diff3", and "zdiff3". -q, --quiet Quiet, suppress feedback messages. --progress, --no-p…...g the merge.conflictStyle configuration variable. Possible values are "merge" (default), "diff3", and "zdiff3". -p, --patch Interactively select hunks in the difference between …Reapply commits on top of another base tip NAME git-rebase - Reapply commits on top of another base tip SYNOPSIS git rebase [-i | --interactive] [<options>] [--exec <cmd>] [--onto …Get and set repository or global options NAME git-config - Get and set repository or global options SYNOPSIS git config list [<file-option>] [<display-option>] [--includes] git con…