diff options
| author | Pat Thoyts <patthoyts@users.sourceforge.net> | 2011-03-25 08:26:47 +0000 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2011-03-25 08:26:47 +0000 |
| commit | fbc9629e2f0cd31ab08638ebbd8f98a323329a5b (patch) | |
| tree | ceab08c1317f01114d7283aba6d3fde72977bddd /git-gui/lib/merge.tcl | |
| parent | git-gui: detect the use of MUI langauge packs on Windows (diff) | |
| parent | mergetool--lib: Add Beyond Compare 3 as a tool (diff) | |
| download | git-fbc9629e2f0cd31ab08638ebbd8f98a323329a5b.tar.gz git-fbc9629e2f0cd31ab08638ebbd8f98a323329a5b.zip | |
Merge branch 'ss/git-gui-mergetool'gitgui-0.14.0
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions