summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-04-02 14:18:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-02 14:18:23 -0700
commit125d8ecefe817db2d51dd5a85c287989ef8a0c0b (patch)
tree8071680e9aa1bb6e4a6d4f3b0ca1b05f87a22f46 /fmt-merge-msg.h
parentMerge branch 'rs/pickaxe-i' (diff)
parentremote-hg: do not fail on invalid bookmarks (diff)
downloadtgif-125d8ecefe817db2d51dd5a85c287989ef8a0c0b.tar.xz
Merge branch 'ap/remote-hg-skip-null-bookmarks'
* ap/remote-hg-skip-null-bookmarks: remote-hg: do not fail on invalid bookmarks
Diffstat (limited to 'fmt-merge-msg.h')
0 files changed, 0 insertions, 0 deletions