summaryrefslogtreecommitdiff
path: root/Documentation/howto/revert-a-faulty-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-09-06 00:12:04 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-06 00:12:04 -0700
commit4682693e9ccc04252d0fad6f5627fc056abcdbba (patch)
treecfd7ed7e969a2f461d24a111187613cb9ba87f9a /Documentation/howto/revert-a-faulty-merge.txt
parentMerge branch 'jl/submodule-ignore-diff' (diff)
parentMerge branch 'xx/trivial' into maint (diff)
downloadtgif-4682693e9ccc04252d0fad6f5627fc056abcdbba.tar.xz
Merge branch 'maint'
* maint: tag.c: whitespace breakages fix Fix whitespace issue in object.c t5505: add missing &&
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions