author | Sven Strickroth <sven.strickroth@tu-clausthal.de> |
---|---|
Fri, 1 Feb 2013 20:16:30 +0000 (21:16 +0100) | |
committer | Junio C Hamano <gitster@pobox.com> |
Sat, 2 Feb 2013 02:06:03 +0000 (18:06 -0800) | |
commit | 81ed7b9 ... 81f7eafb334824264abb492d85a5ffb8 |
tree | 2e2476a ... 211afad3e4301b89e244b48e77dbbece (tree) |
parent | 8bf6719 ... 6da23b39b7b6b18fe99cfa011ec21a11 (diff) |
mergetools/tortoisemerge | diff | blob | history |