diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-22 05:51:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 05:51:29 (GMT) |
| commit | 80f074396d2a5601cdbf643f9b0db09329070a3f (patch) | |
| tree | 7edfc74b4d4ebccc7f2e7b4b288fce3b21b9fec0 /Documentation/git-merge.txt | |
| parent | 8c091d918de73e4600a93088ee0f702224ba99c3 (diff) | |
| parent | 09b7e2204a8e41307192c800162e438ec09ddd2c (diff) | |
| download | git-80f074396d2a5601cdbf643f9b0db09329070a3f.zip git-80f074396d2a5601cdbf643f9b0db09329070a3f.tar.gz git-80f074396d2a5601cdbf643f9b0db09329070a3f.tar.bz2 | |
Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maint
* ph/builtin-srcs-are-in-subdir-these-days:
fix "builtin-*" references to be "builtin/*"
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions