Show More
@@ -843,7 +843,13 b' Supported arguments:' | |||||
843 | ``args`` |
|
843 | ``args`` | |
844 | The arguments to pass to the tool executable. You can refer to the |
|
844 | The arguments to pass to the tool executable. You can refer to the | |
845 | files being merged as well as the output file through these |
|
845 | files being merged as well as the output file through these | |
846 | variables: ``$base``, ``$local``, ``$other``, ``$output``. |
|
846 | variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning | |
|
847 | of ``$local`` and ``$other`` can vary depending on which action is being | |||
|
848 | performed. During and update or merge, ``$local`` represents the original | |||
|
849 | state of the file, while ``$other`` represents the commit you are updating | |||
|
850 | to or the commit you are merging with. During a rebase ``$local`` | |||
|
851 | represents the destination of the rebase, and ``$other`` represents the | |||
|
852 | commit being rebased. | |||
847 | Default: ``$local $base $other`` |
|
853 | Default: ``$local $base $other`` | |
848 |
|
854 | |||
849 | ``premerge`` |
|
855 | ``premerge`` |
General Comments 0
You need to be logged in to leave comments.
Login now