diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-30 13:52:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-30 13:52:44 -0800 |
| commit | 9a6c84e6e9078b0ef4fd2c50b200e8552a28c6fa (patch) | |
| tree | 0001140536704ecf3f0f86686fb6586cbc185ece /Documentation/merge-options.txt | |
| parent | Merge branch 'rr/minimal-stat' (diff) | |
| parent | gitk: Ignore gitk-wish buildproduct (diff) | |
| download | tgif-9a6c84e6e9078b0ef4fd2c50b200e8552a28c6fa.tar.xz | |
Merge git://ozlabs.org/~paulus/gitk
* git://ozlabs.org/~paulus/gitk:
gitk: Ignore gitk-wish buildproduct
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions