Andrew's git / gitweb.git / diff
?
Merge branch 'ap/remote-hg-skip-null-bookmarks'
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 Apr 2014 21:18:23 +0000 (14:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Apr 2014 21:18:23 +0000 (14:18 -0700)
* ap/remote-hg-skip-null-bookmarks:
remote-hg: do not fail on invalid bookmarks

1  2 
contrib/remote-helpers/git-remote-hg patch | diff1 | diff2 | blob | history
contrib/remote-helpers/test-hg.sh patch | diff1 | diff2 | blob | history
diff --cc contrib/remote-helpers/git-remote-hg
Simple merge
diff --cc contrib/remote-helpers/test-hg.sh
Simple merge