diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-07-02 12:52:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-02 12:52:46 -0700 |
| commit | 64d845477b555a06ce469860861691d003335e9c (patch) | |
| tree | 5b11e3b1e24ec047311d18abf2c4d31d7e01f7f7 /contrib/examples/git-merge-ours.sh | |
| parent | Merge git://ozlabs.org/~paulus/gitk (diff) | |
| parent | Merge branch 'maint-1.8.5' into maint (diff) | |
| download | tgif-64d845477b555a06ce469860861691d003335e9c.tar.xz | |
Merge branch 'maint'
* maint:
t7300: repair filesystem permissions with test_when_finished
enums: remove trailing ',' after last item in enum
Diffstat (limited to 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions