git-scripts 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9b4f12ba04e96faf00883173c8d0cea0845c7e0
-  data.tar.gz: 12c60f2f395b73a419140064ed3b1fd2eb017105
+  metadata.gz: 2c2ca318fe924aa752aca19278ee740d1f90f300
+  data.tar.gz: c35e8a783f980234da278208b129cc1b9b5d88c1
 SHA512:
-  metadata.gz: 70be3f8dd49d10c9ebf885e5d70b8cb47633e1357be73ba0ec9e86bb813259e060fd5967fabee47c21aeafd1eac88b29640715a2d34743a4f4d04dcab95c10d4
-  data.tar.gz: c89cf48939bc391ad923d037f4017155f7406ec430fe49720aa8985e9cba2a796cc7225f26a864b59a7a6749f2efcb0f7363b3dca5f563ea356a069b88cb670c
+  metadata.gz: 05edfaba837411ded980bf6775fed80078995c3e024d90c20096273cc07ce01b2b3789090c8fe66c8aa4707e78354664875663bf6a4d173cd3e29b04624566e3
+  data.tar.gz: '04906e08307d0943c156f5d4535cb3fff76e4489b2c20e2dca732adc5e1ac60538f0bf7fa1dc3db4f94d37b7619e9ff81548e641327e0d4612c0f8a4f440efcc'

data/bin/feature

@@ -203,7 +203,7 @@ when 'merge'
    merge_failure_message =
     "Merge conflicts detected, merge #{dev_branch} into #{feature} and resolve conflicts."
    abort_merge =
-    "(git merge --abort && echo #{highlight(failure_message.shellescape)} && exit 1)"
+    "(git merge --abort && echo #{highlight(merge_failure_message.shellescape)} && exit 1)"
 
    Git::run_safe([
       "git fetch",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-scripts
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Daniel Beardsley
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: User scripts for managing feature branches and hotfixes.