aboutsummaryrefslogtreecommitdiff
path: root/Documentation/build-docdep.perl
diff options
context:
space:
mode:
authorBert Wesarg <bert.wesarg@googlemail.com>2010-03-01 22:46:28 +0100
committerJunio C Hamano <gitster@pobox.com>2010-03-02 21:16:45 -0800
commit3a15048d833e2d6599091a9f7c14b0fa926c3bbf (patch)
treee86addd828c1c6486573adfda5fea9083681e391 /Documentation/build-docdep.perl
parent11f3aa2305426d11945c72479d24a15d30768d50 (diff)
downloadgit-3a15048d833e2d6599091a9f7c14b0fa926c3bbf.tar.gz
git-3a15048d833e2d6599091a9f7c14b0fa926c3bbf.tar.xz
merge-file: add option to select union merge favor
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/build-docdep.perl')
0 files changed, 0 insertions, 0 deletions