diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-29 13:44:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-29 13:44:28 -0800 |
| commit | 15470c604d7675dbe444165469f76e931a2edc8e (patch) | |
| tree | 0b12e3b836ce69d3f13b7a00c09402c84cc6ad8b /git-gui/lib/merge.tcl | |
| parent | a4eab8f38ec174abe5eeab8649953460d80d634c (diff) | |
| parent | 73350fb6aa7d0caf6c0e3ab06b73771b282de39d (diff) | |
| download | git-15470c604d7675dbe444165469f76e931a2edc8e.tar.gz git-15470c604d7675dbe444165469f76e931a2edc8e.tar.xz | |
Merge branch 'pw/p4-various-fixes'
* pw/p4-various-fixes:
git p4: remove unneeded cmd initialization
git p4: fix labelDetails typo in exception
git p4 test: display unresolvable host error
git p4: catch p4 errors when streaming file contents
git p4: handle servers without move support
git p4: catch p4 describe errors
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions