diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:45 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:45 -0800 |
commit | 4243b2d1e45a8d0d9b1ccc9d860235e7b9543a7f (patch) | |
tree | 30a290c6a782b9717fcf5cf192800693094a6579 /builtin/merge-recursive.c | |
parent | Merge branch 'ta/format-user-manual-as-an-article' (diff) | |
parent | get_octopus_merge_bases(): cleanup redundant variable (diff) | |
download | tgif-4243b2d1e45a8d0d9b1ccc9d860235e7b9543a7f.tar.xz |
Merge branch 'vm/octopus-merge-bases-simplify'
* vm/octopus-merge-bases-simplify:
get_octopus_merge_bases(): cleanup redundant variable
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions