projects / ~madcoder / dotfiles.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: be76a64) | patch
Use diff3 conflicts.
authorPierre Habouzit <madcoder@debian.org>
Mon, 28 Dec 2009 18:26:38 +0000 (19:26 +0100)
committerPierre Habouzit <madcoder@debian.org>
Mon, 28 Dec 2009 18:26:38 +0000 (19:26 +0100)
commit609886c6cadc4e00226f3ef27557d247eeffa93a
treedf010b89374e840d18d3c5115d729ecbcc4fedfatree | snapshot
parentbe76a648340f421704f96d132e22f71771c68fe2commit | diff
Use diff3 conflicts.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
gitconfig diff | blob | history
MadCoder's dotfiles.