diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:47:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:47:51 -0700 |
| commit | 2851e8eba52e98d3112417952a24d82ae9d8c0eb (patch) | |
| tree | f3405fe2afe9542f5c64fbfe749fac76fb5000bf /Documentation/howto/revert-a-faulty-merge.txt | |
| parent | MinGW: avoid collisions between "tags" and "TAGS" (diff) | |
| parent | Add global and system-wide gitattributes (diff) | |
| download | tgif-2851e8eba52e98d3112417952a24d82ae9d8c0eb.tar.xz | |
Merge branch 'po/etc-gitattributes'
* po/etc-gitattributes:
Add global and system-wide gitattributes
Conflicts:
Documentation/config.txt
Makefile
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions