diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-03-01 13:17:18 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-03-01 13:17:18 -0800 |
commit | 06d67b876642822828596b0b38cda2f61d438335 (patch) | |
tree | 67de0d436a69443bf288411323b0ed209a6cb000 /Documentation/git-mergetool.txt | |
parent | Merge branch 'maint' (diff) | |
parent | Git 1.8.1.5 (diff) | |
download | tgif-06d67b876642822828596b0b38cda2f61d438335.tar.xz |
Sync with 1.8.1.5
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions