Public Git Hosting - git-rebase2.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 62d26db 52d222a)

commit	82637b1a098e0c7597edf244d4596a23638b46ff
author	Max Kirillov <max@max630.net>
	Sun, 8 Jan 2017 19:47:38 +0000 (8 21:47 +0200)
committer	Max Kirillov <max@max630.net>
	Sun, 8 Jan 2017 19:47:38 +0000 (8 21:47 +0200)
tree	faeca59552dfa987e7a2830cb22bb4419644cbd5	tree \| snapshot (tar.gz zip)
parent	62d26db0fd72f66c97a1a20ef4a8ad1d790e2b74	commit \| diff
parent	52d222a42a79a82758907266000a7687e119a4dd	commit \| diff

Merge branch 'print_conflicts'

app/Rehi/GitCommands.hs	diff1 \|	diff2 \|	blob \| history
itest.pl	diff1 \|	diff2 \|	blob \| history

git-rebase2, advanced rebaser