summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-08-19 17:54:49 -0400
committerJoey Hess2014-08-19 17:54:49 -0400
commitd289a222d5915e9307e0e7a9a51f342942a2fe2d (patch)
treea3fb1e70ba76ea98d97c2f5e4435ce1ccd090861 /debian
parentadf8b2ec34d5daec0eb3b060681cce6eceb6238d (diff)
simpler merge
Ah, we've checked out the oldref, so can just merge the newref in and get a branch that is suitable for mergeing into the user's repo. No need for manual diff, which can fail on eg, binaries or no changes.
Diffstat (limited to 'debian')
0 files changed, 0 insertions, 0 deletions