diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:44:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:44:46 -0700 |
| commit | e82c74618b24ddaad56f085f66c90da7ad7a0cb5 (patch) | |
| tree | 33f734238a21c6b5b4fba0bd7be832ae14dfda05 /git-gui/windows | |
| parent | 8272bcabac0b68e6d526ec0fcbc6d6e532b3e2af (diff) | |
| parent | 0a0ec7bd66786bcc2204f299f6c993db19d1f53c (diff) | |
| download | git-e82c74618b24ddaad56f085f66c90da7ad7a0cb5.tar.gz git-e82c74618b24ddaad56f085f66c90da7ad7a0cb5.tar.xz | |
Merge branch 'cj/p4merge' into maint
* cj/p4merge:
Pass empty file to p4merge where no base is suitable.
Diffstat (limited to 'git-gui/windows')
0 files changed, 0 insertions, 0 deletions