diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-01 22:36:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-01 22:36:05 -0700 |
| commit | 763481787174adfcc247d6044bea330edcb2cc24 (patch) | |
| tree | 3acada7b9eb628e8ecb3df8a97edaa61aaf485e1 /Documentation/git-mergetool.txt | |
| parent | fix portability problem with IS_RUN_COMMAND_ERR (diff) | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| download | tgif-763481787174adfcc247d6044bea330edcb2cc24.tar.xz | |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
Documentation: Remove an odd "instead"
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions