summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-08-01 11:52:40 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-08-01 11:52:40 -0700
commit400bf4c46b2bf01cca2658c7d7b4774d7a711486 (patch)
tree748c363a9b94d0da519ddc3bae381b102ba32c6e /resolve-undo.h
parentMerge branch 'jx/clean-interactive' (diff)
parenthg-to-git: --allow-empty-message in git commit (diff)
downloadtgif-400bf4c46b2bf01cca2658c7d7b4774d7a711486.tar.xz
Merge branch 'ma/hg-to-git'
* ma/hg-to-git: hg-to-git: --allow-empty-message in git commit
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions