Backport can handle conflicts in bootstrapbase css. Fixes #76
authorFrederic Massart <fred@moodle.com>
Mon, 10 Mar 2014 06:01:08 +0000 (14:01 +0800)
committerFrederic Massart <fred@moodle.com>
Mon, 10 Mar 2014 06:04:11 +0000 (14:04 +0800)
commit7cf6bd48df5ccf29da3c187bb16e79bd825ebae9
treeaecc421f36829673645abb52378ac9f11ff4abcd
parent563cb6aafa033f02650c8b1f9ca8049f2831ebf8
Backport can handle conflicts in bootstrapbase css. Fixes #76
lib/commands/backport.py
lib/git.py