summaryrefslogtreecommitdiff
path: root/t/t5100
diff options
context:
space:
mode:
authorLibravatar Thomas Arcila <thomas.arcila@gmail.com>2008-03-24 12:55:36 +0100
committerLibravatar Paul Mackerras <paulus@samba.org>2008-05-11 10:50:05 +1000
commit314f5de1a0b91d27cbbb8a400337dd41cf84d511 (patch)
tree13a22a5ff81b7358b27d9128a0d0c57b9bb34296 /t/t5100
parentgitk: Synchronize highlighting in file view for 'f' and 'b' commands (diff)
downloadtgif-314f5de1a0b91d27cbbb8a400337dd41cf84d511.tar.xz
gitk: Allow users to view diffs in external diff viewer
This allows gitk to run an external diff viewer such as meld. Right-click on a file in the file list view gives "External diff" popup menu entry, which launches the selected external diff tool. The menu entry is only active in "Patch" mode, not in "Tree" mode. The program to run to display the diff is configurable through Edit/Preference/External diff tool. The program is run with two arguments, being the names of files containing the two versions to diff. Gitk will create temporary directories called .gitk-tmp.<pid>/<n> to place these files in, and remove them when it's finished. If the file doesn't exist in one or other revision, gitk will supply /dev/null as the name of the file on that side of the diff. This may need to be adjusted for Windows or MacOS. [paulus@samba.org - cleaned up and rewrote some parts of the patch.] Signed-off-by: Thomas Arcila <thomas.arcila@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 't/t5100')
0 files changed, 0 insertions, 0 deletions