| commit | d8f4dc84a9487a7c438853e980cba3e8cbeffb61 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Aug 2010 19:55:10 +0000 (18 12:55 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Aug 2010 19:55:10 +0000 (18 12:55 -0700) | ||
| tree | 15031adb882f1396f24cbe31c1e38deed396ae8e | treesnapshot (tar.gz zip) |
| parent | 2f41ea8af7ecd5fc3f58959fb386b8c76cbc65f2 | commitdiff |
| parent | bd3a97a27a97485b130802d497214be312b737f9 | commitdiff |
Merge branch 'master' into next
* master:
mergetool: Skip autoresolved paths
* master:
mergetool: Skip autoresolved paths