]> arthur.barton.de Git - bup.git/commitdiff
projects / bup.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fdf1da acb68c7)
Merge remote branch 'origin/master'
authorAvery Pennarun <apenwarr@gmail.com>
Sat, 6 Feb 2010 22:03:41 +0000 (17:03 -0500)
committerAvery Pennarun <apenwarr@gmail.com>
Sat, 6 Feb 2010 22:03:41 +0000 (17:03 -0500)
* origin/master:
  cmd-margin: work correctly in python 2.4 when a midx is present.

1  2 
t/test.sh patch | diff1 | diff2 | blob | history

diff --cc t/test.sh
Simple merge
Alex' bup ("It backs things up") development repository