global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-30 11:30:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
2273bd263ce6df8757b0afadeed8b23d0bf1af4e
git/Documentation/git-merge-file.txt
Bert Wesarg 3a15048d83 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>
2010-03-02 21:16:45 -08:00

3.0 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink