Gitblit devel
parent: b8633f | patch | commitdiff
James Moger
2014-03-06 d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd
refs
author James Moger <james.moger@gitblit.com>
Thursday, March 6, 2014 14:32 -0500
committer James Moger <james.moger@gitblit.com>
Thursday, March 6, 2014 14:32 -0500
commitd2ab7a68e4c3f1e619af3576e1443afa2f98cdfd
tree 78c89b4d30a0fb47e8fb1601f54918231f2e9d67 tree | zip | gz
parent b8633f8a62b4f605de0b0c035d2cf29b89164029 view | diff 
Fixed bug in merge: improper use of force and failing on FORCED result
1 files modified
10 ■■■■■ changed files
src/main/java/com/gitblit/utils/JGitUtils.java 10 ●●●●● diff | view | raw | blame | history