diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2008-09-04 21:53:06 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-04 21:53:06 -0700 |
| commit | 95b6a2db25c6c3321be33ac17b6b2e54c407652d (patch) | |
| tree | 0fa5fd758089f21623f36acdb8f1217baccc7cff /t/t5515/fetch.br-config-explicit-octopus_config-explicit | |
| parent | git-gui: Show special diffs for complex conflict cases. (diff) | |
| parent | git-gui: Fix diff parsing for lines starting with "--" or "++" (diff) | |
| download | tgif-95b6a2db25c6c3321be33ac17b6b2e54c407652d.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Fix diff parsing for lines starting with "--" or "++"
Diffstat (limited to 't/t5515/fetch.br-config-explicit-octopus_config-explicit')
0 files changed, 0 insertions, 0 deletions