| commit | e04fe5497ae08ad7334dbc035321e5e42e458615 | |
| author | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Thu, 13 Oct 2011 11:34:49 +0000 (13 12:34 +0100) | ||
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Thu, 13 Oct 2011 11:34:49 +0000 (13 12:34 +0100) | ||
| tree | 436324dabf5a27543e0757e9439243640742cf65 | treesnapshot (tar.gz zip) |
| parent | d6b68655a5f2cd1b36c304a8e63564a8f1ee064e | commitdiff |
copy-files: include the mergetools subdirectory under git-core
The mergetool and difftool utilities now use a directory to locate
scripts that specify how to handle each tool.
Reported-by: eckes <meliundeckes@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
The mergetool and difftool utilities now use a directory to locate
scripts that specify how to handle each tool.
Reported-by: eckes <meliundeckes@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| share/WinGit/copy-files.sh | diffblobblamehistory |