diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-08 22:00:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-08 22:00:53 -0700 |
| commit | cda1bbd474805e653dda8a71d4ea3790e2a66cbb (patch) | |
| tree | 9a3c3c11dc5916646a7bfa1ccedeb0abfec45fbf /t/t6037-merge-ours-theirs.sh | |
| parent | Start the 2.11 cycle (diff) | |
| parent | Start maintenance track for 2.10.x series (diff) | |
| download | tgif-cda1bbd474805e653dda8a71d4ea3790e2a66cbb.tar.xz | |
Sync with maint
* maint:
Prepare for 2.9.4
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions