From 103ea281ff0f2e06f401232d232a952582926f3c Mon Sep 17 00:00:00 2001
From: Peter Cottle <petermcottle@gmail.com>
Date: Tue, 30 Oct 2012 14:05:19 -0700
Subject: [PATCH] merge animation fix

---
 src/git.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/git.js b/src/git.js
index 49cf1f24..8d5e52ff 100644
--- a/src/git.js
+++ b/src/git.js
@@ -1044,6 +1044,12 @@ GitEngine.prototype.mergeStarter = function() {
 
   var newCommit = this.merge(this.generalArgs[0], this.generalArgs[1]);
 
+  if (newCommit === undefined) {
+    // its just a fast forwrard
+    animationFactory.refreshTree(this.animationQueue);
+    return;
+  }
+
   animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit);
 };