diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-28 13:51:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-28 13:51:09 -0700 |
| commit | b2273d06033e5989ca30a72492ca894d0416354f (patch) | |
| tree | a6a79dabf83fc2081b3d10ed3fd1ca9fab409fdb /t/t7605-merge-resolve.sh | |
| parent | Merge branch 'fr/add-interactive-argv-array' (diff) | |
| parent | Documentation/gitk: document the location of the configulation file (diff) | |
| download | tgif-b2273d06033e5989ca30a72492ca894d0416354f.tar.xz | |
Merge branch 'ah/doc-gitk-config'
* ah/doc-gitk-config:
Documentation/gitk: document the location of the configulation file
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions