Revision 54c1ed9a devtools/fabfile.py
| b/devtools/fabfile.py | ||
|---|---|---|
| 185 | 185 |
capture=True).strip() |
| 186 | 186 |
|
| 187 | 187 |
|
| 188 |
<<<<<<< HEAD:devtools/fabfile.py |
|
| 189 |
def _diff_from_master(c,f): |
|
| 190 |
return local("git log --oneline %s..master %s" \
|
|
| 191 |
" | wc -l" % (c, f), capture=True) |
|
| 192 |
======= |
|
| 193 | 188 |
def _diff_from_master(c, f): |
| 194 | 189 |
return local("git log --oneline %s..%s %s"
|
| 195 | 190 |
" | wc -l" % (c, env.upstream, f), capture=True) |
| 196 |
>>>>>>> b3119c3e35ce7bbc820d44ba584e045ec7ad02e7:fabfile.py |
|
| 197 | 191 |
|
| 198 | 192 |
|
| 199 | 193 |
def dch(p): |
Also available in: Unified diff