diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-21 23:54:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-21 23:54:04 -0700 |
| commit | 3e7f1e6ccbfdc652539caba61b9be40c5dd89793 (patch) | |
| tree | 3450376d8b04ba673210ba6adb53e5d6c0163b1b /t/t7605-merge-resolve.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | Documentation/Makefile: fix interrupted builds of user-manual.xml (diff) | |
| download | tgif-3e7f1e6ccbfdc652539caba61b9be40c5dd89793.tar.xz | |
Merge branch 'maint'
* maint:
Documentation/Makefile: fix interrupted builds of user-manual.xml
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions