| commit | 3a15048d833e2d6599091a9f7c14b0fa926c3bbf | |
| author | Bert Wesarg <bert.wesarg@googlemail.com> | |
| Mon, 1 Mar 2010 21:46:28 +0000 (1 22:46 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Mar 2010 05:16:45 +0000 (2 21:16 -0800) | ||
| tree | e86addd828c1c6486573adfda5fea9083681e391 | treesnapshot (tar.gz zip) |
| parent | 11f3aa2305426d11945c72479d24a15d30768d50 | commitdiff |
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>
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-merge-file.txt | diffblobblamehistory | |
| builtin-merge-file.c | diffblobblamehistory |